blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
ningshuxia
2024-05-06 8f6d2b48f22b695574bd4a6c4ac91b1ac9f780b1 
 Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs


@@ -162,7 +162,7 @@




            string runFlag;


            List<AnaPumpFreItem> pump1, pump2, pump3;


            var maxPumpCount = 2;


            var maxPumpCount = 1;


            var anaPumpItemsArray = anaPumpItems.ToArray();


            var parallelHelper = new ParallelConnectionHelper();


            for (int pumpCount = 1; pumpCount <= maxPumpCount; pumpCount++)


@@ -195,6 +195,12 @@


                                    scheduleCombine.Pump1 = freItem.Frequency;


                                    scheduleCombine.CurveQH = freItem.CurveQH.ToJson();


                                    scheduleCombine.CurveQP = freItem.CurveQP.ToJson();




                                    freItem.CurveQH.GetMinMaxPointY(out double maxHead, out double minHead);


                                    scheduleCombine.MinFlow = freItem.CurveQH.Min;


                                    scheduleCombine.MaxFlow = freItem.CurveQH.Max;


                                    scheduleCombine.MaxHead = maxHead;


                                    scheduleCombine.MinHead = minHead;


                                    scheduleCombine.AnaStatus = false;


                                    list.Add(scheduleCombine);


                                }


@@ -239,8 +245,18 @@


                                        scheduleCombine.RunCount = pumpCount;


                                        scheduleCombine.Pump1 = freItem1.Frequency;


                                        scheduleCombine.Pump2 = freItem2.Frequency;


                                        scheduleCombine.CurveQH = FitHelper.BuildCurveExpress(pointQH).ToJson();


                                        scheduleCombine.CurveQP = FitHelper.BuildCurveExpress(pointQP).ToJson();




                                        var curveQH = FitHelper.BuildCurveExpress(pointQH);


                                        var curveQP = FitHelper.BuildCurveExpress(pointQP);




                                        scheduleCombine.CurveQH = curveQH.ToJson();


                                        scheduleCombine.CurveQP = curveQP.ToJson();




                                        curveQH.GetMinMaxPointY(out double maxHead, out double minHead);


                                        scheduleCombine.MinFlow = curveQH.Min;


                                        scheduleCombine.MaxFlow = curveQH.Max;


                                        scheduleCombine.MaxHead = maxHead;


                                        scheduleCombine.MinHead = minHead;


                                        scheduleCombine.AnaStatus = false;


                                        list.Add(scheduleCombine);


                                    }


@@ -290,8 +306,18 @@


                                            scheduleCombine.Pump1 = freItem1.Frequency;


                                            scheduleCombine.Pump2 = freItem2.Frequency;


                                            scheduleCombine.Pump3 = freItem3.Frequency;


                                            scheduleCombine.CurveQH = FitHelper.BuildCurveExpress(pointQH).ToJson();


                                            scheduleCombine.CurveQP = FitHelper.BuildCurveExpress(pointQP).ToJson();




                                            var curveQH = FitHelper.BuildCurveExpress(pointQH);


                                            var curveQP = FitHelper.BuildCurveExpress(pointQP);




                                            scheduleCombine.CurveQH = curveQH.ToJson();


                                            scheduleCombine.CurveQP = curveQP.ToJson();




                                            curveQH.GetMinMaxPointY(out double maxHead, out double minHead);


                                            scheduleCombine.MinFlow = curveQH.Min;


                                            scheduleCombine.MaxFlow = curveQH.Max;


                                            scheduleCombine.MaxHead = maxHead;


                                            scheduleCombine.MinHead = minHead;


                                            scheduleCombine.AnaStatus = false;


                                            list.Add(scheduleCombine);


                                        }