IStation/Service.V4.1.git

			@@ -117,7 +117,7 @@
			error_info = "æµéå¼è¿ä½æ æ³åæ";
			return false;
			}
			if(this._targetOutletPress<= this._targetInletPress + 0.01)
			if (this._targetOutletPress <= this._targetInletPress + 0.003)
			{
			error_info = "è¿åºå£ååå¼è®¾ç½®ä¸åç";
			return false;
			@@ -298,10 +298,12 @@
			#region é¢ç®ä¸ä¸
			List<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase> all_machine_ana_result_list =
			new List<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase>();
			int frequency_pump_count = 0;
			foreach (var machine in this._allMachineList)
			{
			if (machine.IsFrequency)
			{//åé¢æ³µ
			frequency_pump_count ++ ;
			var anaData = GetFrePumpAnaData(machine);
			if (anaData != null)
			{
			@@ -325,17 +327,69 @@
			{
			return null;
			}
			else if (all_machine_ana_result_list.Count() == 1)
			if (frequency_pump_count>0)
			{
			var first_pump = all_machine_ana_result_list.First();
			first_pump.AsFrequency = true;
			IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[] open_machine_list = new
			IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[] { first_pump };
			AnaMahineComb(open_machine_list);
			#region æåé¢æ³µ,å¯ä»¥ç²¾ç¡®è®¡ç®
			if (all_machine_ana_result_list.Count() == 1)
			{
			var first_pump = all_machine_ana_result_list.First();
			first_pump.AsFrequency = true;
			IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[] open_machine_list = new
			IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[] { first_pump };
			AnaMahineComb(open_machine_list);
			}
			else
			{
			int max_fre_num = 2;//æå¤åé¢2å°, å¶ä½çå³ä½¿åé¢,ä¹æ50HZè¿è¡
			var arry_allMachineList = all_machine_ana_result_list.ToArray();
			for (int openPumpNum = 1; openPumpNum <= all_machine_ana_result_list.Count(); openPumpNum++)
			{
			//å¾å°æææåç»å
			List<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[]> open_machine_combine_list =
			IStation.Model.PermutationAndCombination<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase>.GetCombination(
			arry_allMachineList, openPumpNum);

			foreach (var open_machine_list in open_machine_combine_list)
			{
			var fre_machines = (from x in open_machine_list where x.IsFrequency select x).ToArray();

			if (fre_machines.Count() > max_fre_num)
			{//æå¤æ2å°æ³µå½ä½åé¢æ³µè¿è¡, å¶ä½æå·¥é¢æ³µè¿è¡
			List<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[]> real_fre_machine_combine_list =
			IStation.Model.PermutationAndCombination<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase>.GetCombination(
			fre_machines, max_fre_num);//æåç»å,æ¾éé¢ç2å°

			foreach (var real_fre_machine_list in real_fre_machine_combine_list)
			{
			foreach (var m in fre_machines)
			{//åæææåé¢æ³µå½ä½å·¥é¢æ³µ
			m.AsFrequency = false;
			}
			foreach (var m in real_fre_machine_list)
			{//ææåç»åä¸çä¸¤å°è®¾ç½®ä½åé¢æ³µ
			m.AsFrequency = true;
			}
			int ana_ret = AnaMahineComb(open_machine_list);
			}

			}
			else
			{
			foreach (var m in fre_machines)
			{
			if (m.IsFrequency)
			m.AsFrequency = true;
			}
			int ana_ret = AnaMahineComb(open_machine_list);
			}
			}
			}
			}
			#endregion
			}
			else
			{
			int max_fre_num = 2;//æå¤åé¢2å°, å¶ä½çå³ä½¿åé¢,ä¹æ50HZè¿è¡
			#region é½æ¯å·¥é¢æ³µ
			var arry_allMachineList = all_machine_ana_result_list.ToArray();
			for (int openPumpNum = 1; openPumpNum <= all_machine_ana_result_list.Count(); openPumpNum++)
			{
			@@ -346,39 +400,10 @@

			foreach (var open_machine_list in open_machine_combine_list)
			{
			var fre_machines = (from x in open_machine_list where x.IsFrequency select x).ToArray();

			if (fre_machines.Count() > max_fre_num)
			{//æå¤æ2å°æ³µå½ä½åé¢æ³µè¿è¡, å¶ä½æå·¥é¢æ³µè¿è¡
			List<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase[]> real_fre_machine_combine_list =
			IStation.Model.PermutationAndCombination<IStation.Calculation.DispatchAna.Model.PumpAnaDataBase>.GetCombination(
			fre_machines, max_fre_num);//æåç»å,æ¾éé¢ç2å°

			foreach (var real_fre_machine_list in real_fre_machine_combine_list)
			{
			foreach (var m in fre_machines)
			{//åæææåé¢æ³µå½ä½å·¥é¢æ³µ
			m.AsFrequency = false;
			}
			foreach (var m in real_fre_machine_list)
			{//ææåç»åä¸çä¸¤å°è®¾ç½®ä½åé¢æ³µ
			m.AsFrequency = true;
			}
			int ana_ret = AnaMahineComb(open_machine_list);
			}

			}
			else
			{
			foreach (var m in fre_machines)
			{
			if (m.IsFrequency)
			m.AsFrequency = true;
			}
			int ana_ret = AnaMahineComb(open_machine_list);
			}
			int ana_ret = AnaMahineComb(open_machine_list);
			}
			}
			}
			#endregion
			}

			#endregion
			@@ -439,12 +464,14 @@
			int fre_pump_count = 0;
			double total_min_flow_å¼æºæ³µ = 0;
			double total_max_flow_å¼æºæ³µ = 0;

			foreach (var machine in open_machine_list)
			{
			total_max_flow_å¼æºæ³µ += machine.AnaItem50Hz.CurveInfoQH.Max;

			if (machine.IsFrequency)
			{

			if (!machine.AsFrequency)
			{
			fixPumpAnaCombine.Add(machine);
			@@ -1435,16 +1462,17 @@

			int addPrjNum = 0;
			var freqPump = allFreqPumpAnaList.FirstOrDefault();
			{
			{
			var frePump_flow = (this._targetQ - fix_pump_total_flow);
			double h = //this.CalcHeadByPress(this._targetInletPress, this._targetOutletPress);
			Math.Round(this.CalcHeadByPress(this._targetInletPress, this._targetOutletPress,
			freqPump.MachineDetail.InletCaliber, freqPump.MachineDetail.OutletCaliber,
			(this._targetQ - fix_pump_total_flow) ), 3);

			freqPump.MachineDetail.InletCaliber, freqPump.MachineDetail.OutletCaliber, frePump_flow), 3);
			var dp = new IStation.Model.CurvePoint(frePump_flow, h);
			var wrkSpeed = IStation.Common.SpeedSimuCalculer.GetSimuValue(
			freqPump.MachineDetail.MaxCurveInfoQH,
			new IStation.Model.CurvePoint(_targetQ - fix_pump_total_flow, h), 2900);

			dp, 2900);
			if (wrkSpeed < 0)
			return 0;//
			IStation.Calculation.DispatchAna.Model.AnaCurveItem currentAna = new IStation.Calculation.DispatchAna.Model.AnaCurveItem();

			double fre = Math.Round(50 * wrkSpeed / 2900, 1);

	Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper压力.cs	120 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/IStation.Model.Curve/特性曲线/FeatCurveHelper.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -43,11 +43,12 @@
			//_dict.Add(19, new StationInfo(14, new IStation.Calculation.shyséè¡äºå())); //NG 1æ5æ¶, åºå£ååä½äºæ°´æ± æ°´ä½
			#if (DEBUG)

			_dict.Add(20, new StationInfo(18, new IStation.Calculation.shyséæ³½åæ°´()));

			//_0402010701011204001 åºè¯¥æ¯æ°´ä½æ¯å¦æé, æ²çº¿ä¸å¨

			#else
			_dict.Add(18, new StationInfo(1 , new IStation.Calculation.shyséèæ²åæ°´()));//å¨æ¯0 æ¯å¦æ£ç¡®?
			_dict.Add(20, new StationInfo(18, new IStation.Calculation.shyséæ³½åæ°´()));

			_dict.Add(10, new StationInfo(10, new IStation.Calculation.shyséæµ·æ³µç«()));// OK ç¬¬ä¸æ¹ æ²çº¿å»¶é¿, ä¸éè¦å¢å åºå£ååæè½è®¡ç®
			_dict.Add(14, new StationInfo(17, new IStation.Calculation.shysæ³°åæ³µç«()));// OK ç¬¬ä¸æ¹ æ²çº¿å»¶é¿,

			@@ -23,7 +23,7 @@
			return default;
			double f_ratio = hz / 50.0;
			var list= pts.Select(x => new CurvePoint(x.X * f_ratio, x.Y * f_ratio * f_ratio)).ToList();
			return new CurveExpress(pts,fit);
			return new CurveExpress(list, fit);
			}

			/// <summary>
			@@ -38,7 +38,7 @@
			return default;
			double f_ratio = hz / 50.0;
			var list = pts.Select(x => new CurvePoint(x.X * f_ratio, x.Y * f_ratio * f_ratio * f_ratio)).ToList();
			return new CurveExpress(pts, fit);
			return new CurveExpress(list, fit);
			}