-refactoring unit tests

- refacotring the many PlantSimulator.SimulateSingle alternatives.
equinor · Dec 17, 2024 · c2ece8e · c2ece8e
1 parent 6516a66
commit c2ece8e
Show file tree

Hide file tree

Showing 13 changed files with 417 additions and 375 deletions.
diff --git a/Dynamic/Identification/ClosedLoopUnitIdentifier.cs b/Dynamic/Identification/ClosedLoopUnitIdentifier.cs
@@ -459,7 +459,7 @@ private static double EstimateDisturbanceLF(UnitDataSet dataSet, UnitModel unitM
             {
                 unitParams.LinearGains = new double[] { Kp };
                 umInternal.SetModelParameters(unitParams);
-                (var isOk, var y_proc) = PlantSimulator.SimulateSingle(dataSet, umInternal, false);
+                (var isOk, var y_proc) = PlantSimulator.SimulateSingle(dataSet, umInternal);
                 var d_LF = vec.Multiply(vec.Subtract(y_proc, y_proc[0]), -1);
                 var d_est1 = vec.Add(d_HF, d_LF);
                 var d_est2 = vec.Subtract(dataSet.Y_meas, y_proc);

diff --git a/Dynamic/Identification/DisturbanceCalculator.cs b/Dynamic/Identification/DisturbanceCalculator.cs
@@ -289,7 +289,7 @@ public static DisturbanceIdResult CalculateDisturbanceVector(UnitDataSet unitDat
             // non-disturbance related changes in the dataset producing "unitDataSet_adjusted"
             var unitDataSet_adjusted = RemoveSetpointAndOtherInputChangeEffectsFromDataSet(unitDataSet, unitModel, pidInputIdx, pidParams);
             unitDataSet_adjusted.D = null;
-            (bool isOk, double[] y_proc) = PlantSimulator.SimulateSingle(unitDataSet_adjusted, unitModel, false);
+            (bool isOk, double[] y_proc) = PlantSimulator.SimulateSingle(unitDataSet_adjusted, unitModel);
 
             if (y_proc == null)
             {

diff --git a/Dynamic/Identification/FitScoreCalculator.cs b/Dynamic/Identification/FitScoreCalculator.cs
@@ -95,7 +95,10 @@ static public double GetPlantWideSimulated(PlantSimulator plantSimObj, TimeSerie
                     {
                         if (!modelObj.GetAdditiveInputIDs()[0].StartsWith(disturbanceSignalPrefix))
                         {
-                            measY = inputData.GetValues(outputName);
+                            if (inputData.ContainsSignal(outputName))
+                            {
+                                measY = inputData.GetValues(outputName);
+                            }
                         }
                     }
                     else if (inputData.ContainsSignal(outputName))

diff --git a/Dynamic/Identification/GainSchedIdentifier.cs b/Dynamic/Identification/GainSchedIdentifier.cs
@@ -388,7 +388,7 @@ static private (GainSchedParameters, int) ChooseBestModelFromFittingInfo(
             if (simulateAndAddToYsimInDataSet)
             {
                 var bestModel = new GainSchedModel(BestGainSchedParams);
-                PlantSimulator.SimulateSingle(dataSet, bestModel, true);
+                PlantSimulator.SimulateSingleToYsim(dataSet, bestModel);
             }
             return (BestGainSchedParams, bestModelIdx);
         }
@@ -512,7 +512,7 @@ private static bool DetermineOperatingPointAndSimulate(ref GainSchedParameters g
             }
             gsParams.MoveOperatingPointUWithoutChangingModel(desiredOpU);
 
-            (var isOk, var y_sim) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel,false);
+            (var isOk, var y_sim) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel);
 
             if (isOk)
             {
@@ -523,7 +523,7 @@ private static bool DetermineOperatingPointAndSimulate(ref GainSchedParameters g
                 if (estBias.HasValue)
                 {
                     gsParams.IncreaseOperatingPointY(estBias.Value);
-                    (var isOk2, var y_sim2) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel, false);
+                    (var isOk2, var y_sim2) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel);
                     dataSet.Y_sim = y_sim2;
                     if (gsParams.Fitting == null)
                         gsParams.Fitting = new FittingInfo();
@@ -587,7 +587,7 @@ private static void EstimateTimeDelay(ref GainSchedParameters gsParams, ref Unit
                 copiedGsParams.TimeConstant_s = vec.Subtract(gsParams.TimeConstant_s, timedelay_s);
 
                 var gsIdentModel = new GainSchedModel(copiedGsParams, "ident_model");
-                (var isOk, var y_sim) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel, false);
+                (var isOk, var y_sim) = PlantSimulator.SimulateSingle(dataSet, gsIdentModel);
 
                 if (isOk)
                 {

diff --git a/Dynamic/Identification/UnitIdentifier.cs b/Dynamic/Identification/UnitIdentifier.cs
@@ -118,9 +118,7 @@ public static UnitModel IdentifyLinearDiff(ref UnitDataSet dataSet, FittingSpecs
 
             if (model.modelParameters.Fitting.WasAbleToIdentify)
             {
-                PlantSimulator.SimulateSingle(dataSet, model, true);
-                //var simulator = new UnitSimulator(model);
-                //simulator.Simulate(ref dataSet, default, true);// overwrite any y_sim
+                PlantSimulator.SimulateSingleToYsim(dataSet, model);
                 model.SetFittedDataSet(dataSet);
             }
             return model;
@@ -451,10 +449,9 @@ private static UnitModel Identify_Internal(ref UnitDataSet dataSet, FittingSpecs
             // simulate
             if (modelParameters.Fitting.WasAbleToIdentify)
             {
-                PlantSimulator.SimulateSingle(dataSet, model, true);// overwrite any y_sim
+                PlantSimulator.SimulateSingleToYsim(dataSet, model);
                 model.SetFittedDataSet(dataSet);
              }
-
             return model;
         }