Changeset 17652

Timestamp:

07/07/20 14:19:36 (4 years ago)

Author:

chaider

Message:

#3076 Persistence fixes and small changes

Location:

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• MultiObjective/SymbolicRegressionMultiObjectiveConstraintAnalyzer.cs (modified) (1 diff)
• MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs (modified) (1 diff)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (1 diff)

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveConstraintAnalyzer.cs

@@ -153 +153 @@
     private static IEnumerable<string> GetColumnNames(IEnumerable<IntervalConstraint> constraints) {
       yield return "NMSE";
-      foreach (var constraint in constraints) yield return constraint.Expression;
+      foreach (var constraint in constraints) {
+        if(constraint.Enabled)
+          yield return constraint.Expression;
+      }
+        
     }
 

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs

@@ -8 +8 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.MultiObjective {
-  public class
-    SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
+  [StorableType("9397A63D-0C6B-4733-BD1A-59AAE9A9F006")]
+  public class SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
     #region Constructors
 

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs

@@ -45 +45 @@
       var targetValues    = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
       var errorState      = OnlineCalculatorError.None;
-
+      
       var constraints    = problemData.IntervalConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();