Changeset 17636

Timestamp:

06/29/20 15:45:24 (4 years ago)

Author:

chaider

Message:

#3076 Changed variable ranges to be readonly

Location:

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

Files:

• MultiObjective/SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs (modified) (2 diffs)
• MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs (modified) (3 diffs)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (1 diff)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (1 diff)
• SymbolicRegressionConstraintAnalyzer.cs (modified) (3 diffs)
• SymbolicRegressionSolution.cs (modified) (1 diff)

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

@@ -91 +91 @@
 
       var constraints    = problemData.IntervalConstraints.Constraints.Where(c => c.Enabled);
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
 
       var objectives = new List<double> {nmse}; //Add r² to resultlist
@@ -103 +103 @@
 
     private static double ConstraintExceeded(IntervalConstraint constraint, IntervalInterpreter intervalInterpreter,
-                                             IDictionary<string, Interval> variableRanges,
+                                             IReadOnlyDictionary<string, Interval> variableRanges,
                                              ISymbolicExpressionTree solution) {
       return SymbolicRegressionConstraintAnalyzer.ConstraintSatisfied(constraint, new IntervalInterpreter(),

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

@@ -120 +120 @@
 
       var constraints    = problemData.IntervalConstraints.Constraints.Where(c => c.Enabled);
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
 
       var objectives          = new List<double> {nmse};
@@ -144 +144 @@
 
     public static double ConstraintExceeded(IntervalConstraint constraint, IntervalInterpreter intervalInterpreter,
-                                            IDictionary<string, Interval> variableRanges,
+                                            IReadOnlyDictionary<string, Interval> variableRanges,
                                             ISymbolicExpressionTree solution /*, bool splitting*/) {
       if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
@@ -189 +189 @@
       get {
         var objectives = new List<bool> {false};          //First NMSE ==> min
-        objectives.AddRange(Enumerable.Repeat(false, 3)); //Constraints ==> min
+        objectives.AddRange(Enumerable.Repeat(false, 2)); //Constraints ==> min
 
         return objectives;

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

@@ -44 +44 @@
 
       var constraints    = problemData.IntervalConstraints.EnabledConstraints;
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
 
       if (!SymbolicRegressionConstraintAnalyzer.ConstraintsSatisfied(constraints, variableRanges, tree)) return 0;

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

@@ -47 +47 @@
 
       var constraints    = problemData.IntervalConstraints.EnabledConstraints;
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
       var tree           = solution;
 

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

@@ -63 +63 @@
       var results        = ResultCollectionParameter.ActualValue;
       var constraints    = problemData.IntervalConstraints.EnabledConstraints;
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
       var newDataTable   = ConstraintViolationParameter.ActualValue;
 
@@ -82 +82 @@
     public static bool ConstraintSatisfied(IntervalConstraint            constraint,
                                            IntervalInterpreter           intervalInterpreter,
-                                           IDictionary<string, Interval> variableRanges,
+                                           IReadOnlyDictionary<string, Interval> variableRanges,
                                            ISymbolicExpressionTree       solution) {
       if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
@@ -110 +110 @@
 
     public static bool ConstraintsSatisfied(IEnumerable<IntervalConstraint> constraints,
-                                            IDictionary<string, Interval>   variableRanges,
+                                            IReadOnlyDictionary<string, Interval>   variableRanges,
                                             ISymbolicExpressionTree         solution) {
       var intervalInterpreter = new IntervalInterpreter();

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

@@ -200 +200 @@
       var problemData = solution.ProblemData;
       var model = solution.Model;
-      var variableRanges = problemData.VariableRanges.GetDictionary();
+      var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
 
       intervalEvaluation.AddInterval($"Target {problemData.TargetVariable}", new Interval(variableRanges[problemData.TargetVariable].LowerBound, variableRanges[problemData.TargetVariable].UpperBound));