- ClosedLoopUnitIdentifier changed to static for convenience

equinor · Dec 4, 2024 · 95e3126 · 95e3126
1 parent 53cd1c4
commit 95e3126
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/Dynamic/Identification/ClosedLoopUnitIdentifier.cs b/Dynamic/Identification/ClosedLoopUnitIdentifier.cs
@@ -54,7 +54,7 @@ public class ClosedLoopUnitIdentifier
         /// <param name = "pidInputIdx">the index of the PID-input to the unit model</param>
         /// 
         /// <returns>The unit model, with the name of the newly created disturbance added to the additiveInputSignals</returns>
-        public (UnitModel, double[]) Identify(UnitDataSet dataSet, PidParameters pidParams = null, int pidInputIdx = 0)
+        public static (UnitModel, double[]) Identify(UnitDataSet dataSet, PidParameters pidParams = null, int pidInputIdx = 0)
         {
             bool wasGainGlobalSearchDone = false;
             bool doTimeDelayEstOnRun1 = false;
@@ -344,7 +344,7 @@ public class ClosedLoopUnitIdentifier
             return (identUnitModel,disturbance);
         }
 
-        private Tuple<UnitModel,double> GlobalSearchLinearPidGain(UnitDataSet dataSet, PidParameters pidParams, int pidInputIdx, 
+        private static Tuple<UnitModel,double> GlobalSearchLinearPidGain(UnitDataSet dataSet, PidParameters pidParams, int pidInputIdx, 
             UnitModel unitModel_run1, double pidProcessInputInitalGainEstimate, double minPidProcessGain,
             double maxPidProcessGain, FittingSpecs fittingSpecs, int numberOfGlobalSearchIterations = 40)
         {
@@ -581,7 +581,7 @@ private Tuple<UnitModel,double> GlobalSearchLinearPidGain(UnitDataSet dataSet, P
             return new Tuple<UnitModel,double>(bestUnitModel, gainUnc);
         }
 
-        private Tuple<UnitModel, DisturbanceIdResult> EstimateSISOdisturbanceForProcGain( UnitModel referenceMISOmodel, 
+        private static Tuple<UnitModel, DisturbanceIdResult> EstimateSISOdisturbanceForProcGain( UnitModel referenceMISOmodel, 
             double pidLinProcessGain, int pidInputIdx, UnitDataSet dataSet, PidParameters pidParams)
         {
             var alternativeModel = new UnitModel(referenceMISOmodel.modelParameters.CreateCopy(), "SISO");
@@ -631,7 +631,7 @@ private Tuple<UnitModel, DisturbanceIdResult> EstimateSISOdisturbanceForProcGain
         /// <param name="disturbance">disturbance vector</param>
         /// <param name="name">optional name used for plotting</param>
         /// <returns></returns>
-        public bool ClosedLoopSim(UnitDataSet unitData, UnitParameters modelParams, PidParameters pidParams,
+        public static bool ClosedLoopSim(UnitDataSet unitData, UnitParameters modelParams, PidParameters pidParams,
             double[] disturbance,string name="")
         {
             if (pidParams == null)

diff --git a/...ic/PlantSimulator/PlantSimulatorHelper.cs → ...lantSimulator/PlantSimulatorSerializer.cs b/...ic/PlantSimulator/PlantSimulatorHelper.cs → ...lantSimulator/PlantSimulatorSerializer.cs
diff --git a/TimeSeriesAnalysis.Tests/Examples/SystemIdent.cs b/TimeSeriesAnalysis.Tests/Examples/SystemIdent.cs
@@ -196,8 +196,7 @@ void ClosedLoopId()
             Assert.IsTrue(isOk);
             var pidDataSet = processSim.GetUnitDataSetForPID(inputData.Combine(simData), pidModel1);
 
-            var modelId = new ClosedLoopUnitIdentifier();
-            (var identifiedModel, var estDisturbance) = modelId.Identify(pidDataSet, pidModel1.GetModelParameters());
+            (var identifiedModel, var estDisturbance) = ClosedLoopUnitIdentifier.Identify(pidDataSet, pidModel1.GetModelParameters());
 
             Console.WriteLine(identifiedModel.ToString());
 

diff --git a/TimeSeriesAnalysis.Tests/Tests/FindDisturbanceAndModelSimultanouslyTester_MISO.cs b/TimeSeriesAnalysis.Tests/Tests/FindDisturbanceAndModelSimultanouslyTester_MISO.cs
@@ -322,8 +322,7 @@ public void GenericMISODisturbanceTest  (UnitModel trueProcessModel, double[] tr
                 pidDataSet.U[500,0] = Double.NaN;
             }
 
-            var modelId = new ClosedLoopUnitIdentifier();
-            (var identifiedModel, var estDisturbance) = modelId.Identify(pidDataSet, pidModel1.GetModelParameters(), pidInputIdx);
+            (var identifiedModel, var estDisturbance) = ClosedLoopUnitIdentifier.Identify(pidDataSet, pidModel1.GetModelParameters(), pidInputIdx);
 
             Console.WriteLine(identifiedModel.ToString());
             Console.WriteLine();

diff --git a/TimeSeriesAnalysis.Tests/Tests/FindDisturbanceAndModelSimultanouslyTester_SISO.cs b/TimeSeriesAnalysis.Tests/Tests/FindDisturbanceAndModelSimultanouslyTester_SISO.cs
@@ -314,8 +314,7 @@ public void GenericDisturbanceTest  (UnitModel trueProcessModel, double[] trueDi
 
             }
 
-            var modelId = new ClosedLoopUnitIdentifier();
-            (var identifiedModel, var estDisturbance) = modelId.Identify(pidDataSet, pidModel1.GetModelParameters());
+            (var identifiedModel, var estDisturbance) = ClosedLoopUnitIdentifier.Identify(pidDataSet, pidModel1.GetModelParameters());
 
             Console.WriteLine(identifiedModel.ToString());
             Console.WriteLine();