Changeset 13660

Timestamp:

03/07/16 15:27:37 (9 years ago)

Author:

gkronber

Message:

#2572: removed null checks

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSolutionsAnalyzer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSolutionsAnalyzer.cs

@@ -95 +95 @@
       ILookupParameter<DoubleValue> testQualityParam = null;
       // store actual names of parameter because it is changed below
-      string prevTrainingQualityParamName = TrainingQualityParameterName;
-      string prevTestQualityParamName = TestQualityParameterName;
-      if (Parameters.ContainsKey(TrainingQualityParameterName)) {
-        trainingQualityParam = TrainingQualityParameter;
-        prevTrainingQualityParamName = trainingQualityParam.ActualName;
-      }
-      if (Parameters.ContainsKey(TestQualityParameterName)) {
-        testQualityParam = TestQualityParameter;
-        prevTestQualityParamName = testQualityParam.ActualName;
-      }
-
+      trainingQualityParam = TrainingQualityParameter;
+      string prevTrainingQualityParamName = trainingQualityParam.ActualName;
+      testQualityParam = TestQualityParameter;
+      string prevTestQualityParamName = testQualityParam.ActualName;
       foreach (var result in results.Where(r => r.Value is IRegressionSolution)) {
         var solution = (IRegressionSolution)result.Value;
@@ -122 +115 @@
         // also add training and test R² to the scope using the parameters
         // HACK: we change the ActualName of the parameter to write two variables for each solution in the results collection
-        if (trainingQualityParam != null) {
-          trainingQualityParam.ActualName = trainingR2Name;
-          trainingQualityParam.ActualValue = new DoubleValue(solution.TrainingRSquared);
-        }
-        if (testQualityParam != null) {
-          testQualityParam.ActualName = testR2Name;
-          testQualityParam.ActualValue = new DoubleValue(solution.TestRSquared);
-        }
+        trainingQualityParam.ActualName = trainingR2Name;
+        trainingQualityParam.ActualValue = new DoubleValue(solution.TrainingRSquared);
+        testQualityParam.ActualName = testR2Name;
+        testQualityParam.ActualValue = new DoubleValue(solution.TestRSquared);
       }
 
-      if (trainingQualityParam != null) trainingQualityParam.ActualName = prevTrainingQualityParamName;
-      if (testQualityParam != null) testQualityParam.ActualName = prevTestQualityParamName;
+      trainingQualityParam.ActualName = prevTrainingQualityParamName;
+      testQualityParam.ActualName = prevTestQualityParamName;
 
       return base.Apply();