Changeset 16773 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective

Timestamp:

04/09/19 14:58:24 (6 years ago)

Author:

chaider

Message:

#2971

• Fixes and updates in IntervalConstraintView
• Changed Parser

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (3 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

@@ -85 +85 @@
     }
 
-    static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
+    public static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
       IRegressionProblemData problemData) {
-      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
       var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
       var constraintViolations = new Dictionary<IntervalConstraint, bool>();
@@ -101 +100 @@
     }
 
-    static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicRegressionModel model,
+    public static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicRegressionModel model,
       IRegressionProblemData problemData) {
       return CheckConstraints(model.SymbolicExpressionTree, problemData);
     }
 
-    static bool CheckConstraint(ISymbolicExpressionTree model, Dictionary<string, Interval> variableRanges,
+    public static bool CheckConstraint(ISymbolicExpressionTree model, Dictionary<string, Interval> variableRanges,
       IntervalConstraint constraint) {
       var intervalInterpreter = new IntervalInterpreter();
@@ -148 +147 @@
       var constraintViolations = new Dictionary<string, int>();
 
-      //var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
       var constraints = problemData.IntervalConstraintsParameter.Value.Constraints;