From 3d5771f9c195698c7694fb22afea2e2040553389 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 03 四月 2025 16:56:20 +0800
Subject: [PATCH] bug修改
---
01-api/_Expand/IStation.Win.Schedule/bjMain.Designer.cs | 18 +++++++++---------
01-api/_Expand/IStation.Win.Schedule/bjMain.resx | 3 +++
01-api/_Expand/IStation.Win.Schedule/bjMain.cs | 6 +++---
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/01-api/_Expand/IStation.Win.Schedule/bjMain.Designer.cs b/01-api/_Expand/IStation.Win.Schedule/bjMain.Designer.cs
index eab3e4b..3ae166f 100644
--- a/01-api/_Expand/IStation.Win.Schedule/bjMain.Designer.cs
+++ b/01-api/_Expand/IStation.Win.Schedule/bjMain.Designer.cs
@@ -39,6 +39,7 @@
repImgCmbRealTime = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
barCekSimSchedule = new DevExpress.XtraBars.BarCheckItem();
barCekUseCalcDev = new DevExpress.XtraBars.BarCheckItem();
+ barCekCalcFlowDiff = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new RibbonPage();
ribbonPageGroup1 = new RibbonPageGroup();
gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -104,7 +105,6 @@
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- barCekCalcFlowDiff = new DevExpress.XtraBars.BarCheckItem();
((System.ComponentModel.ISupportInitialize)ribbon).BeginInit();
((System.ComponentModel.ISupportInitialize)repImgDate).BeginInit();
((System.ComponentModel.ISupportInitialize)repImgCmbRealTime).BeginInit();
@@ -196,6 +196,14 @@
barCekUseCalcDev.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekUseCalcDev.ImageOptions.SvgImage");
barCekUseCalcDev.Name = "barCekUseCalcDev";
barCekUseCalcDev.CheckedChanged += barCekUseCalcDev_CheckedChanged;
+ //
+ // barCekCalcFlowDiff
+ //
+ barCekCalcFlowDiff.Caption = "璁＄畻娴侀噺鍋忓樊";
+ barCekCalcFlowDiff.Id = 10;
+ barCekCalcFlowDiff.ImageOptions.SvgImage = Properties.Resources.weather_water;
+ barCekCalcFlowDiff.Name = "barCekCalcFlowDiff";
+ barCekCalcFlowDiff.CheckedChanged += barCekCalcFlowDiff_CheckedChanged;
//
// ribbonPage1
//
@@ -802,14 +810,6 @@
layoutControlItem3.Size = new Size(1248, 217);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
- //
- // barCekCalcFlowDiff
- //
- barCekCalcFlowDiff.Caption = "璁＄畻娴侀噺鍋忓樊";
- barCekCalcFlowDiff.Id = 10;
- barCekCalcFlowDiff.ImageOptions.SvgImage = Properties.Resources.weather_water;
- barCekCalcFlowDiff.Name = "barCekCalcFlowDiff";
- barCekCalcFlowDiff.CheckedChanged += barCekCalcFlowDiff_CheckedChanged;
//
// bjMain
//
diff --git a/01-api/_Expand/IStation.Win.Schedule/bjMain.cs b/01-api/_Expand/IStation.Win.Schedule/bjMain.cs
index 66685d2..733bdc0 100644
--- a/01-api/_Expand/IStation.Win.Schedule/bjMain.cs
+++ b/01-api/_Expand/IStation.Win.Schedule/bjMain.cs
@@ -1,7 +1,6 @@
锘縰sing IStation.Curve;
using MathNet.Numerics.LinearAlgebra;
using MathNet.Numerics.LinearAlgebra.Double;
-using System.Formats.Asn1;
using System.IO;
using System.Text;
using Yw.Untity;
@@ -160,6 +159,7 @@
var pX = double.Parse(xStr);
var pY = double.Parse(yStr);
+ pY = Math.Abs(pY);
ptList.Add(new CurvePoint(pX, pY));
}
@@ -174,7 +174,7 @@
var y = ptList.Select(x => x.Y).ToArray();
// 澶氶」寮忓洖褰掔殑闃舵暟锛堜緥濡傦紝浜屾澶氶」寮忥級
- int degree = 8;
+ int degree = 10;
// 鎷熷悎澶氶」寮忓洖褰掓ā鍨�
double[] coefficients = NonlinearRegressionHelper.FitPolynomial(x, y, degree);
@@ -183,7 +183,7 @@
double xNew = target_pressure2;
double yPredicted = NonlinearRegressionHelper.PredictPolynomial(xNew, coefficients);
- target_flow2 -= yPredicted;
+ target_flow2 += yPredicted;
AlertTool.ShowInfo(this,"棰勬祴缂哄け",$"{yPredicted}");
// 璁＄畻 R虏 鍜� MSE
diff --git a/01-api/_Expand/IStation.Win.Schedule/bjMain.resx b/01-api/_Expand/IStation.Win.Schedule/bjMain.resx
index 7641619..ae6fcbe 100644
--- a/01-api/_Expand/IStation.Win.Schedule/bjMain.resx
+++ b/01-api/_Expand/IStation.Win.Schedule/bjMain.resx
@@ -164,4 +164,7 @@
<metadata name="pumpScheduleVmBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>317, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>60</value>
+ </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3