Changeset 16800 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

Timestamp:

04/17/19 14:37:55 (5 years ago)

Author:

chaider

Message:

#2971 Several chanages regarding review comments

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -170 +170 @@
         if (!dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
         var variableInterval = Interval.GetInterval(dataset.GetDoubleValues(variable.Value));
-        namedIntervals.Add(variable.Value, variableInterval);
+        namedIntervals.VariableIntervals.Add(variable.Value, variableInterval);
       }
       
-      var commentMessage = "#Example of a target variable constraint" + Environment.NewLine +
-                           "#F1: TargetVariable" + Environment.NewLine +
-                           "#in: keyword has to follow" + Environment.NewLine +
-                           "#bracket: open or closed regarding to open or closed interval definition" + Environment.NewLine +
-                           "#double: lowerbound of the interval" + Environment.NewLine +
-                           "#..: keyword has to follow to seperate lowerbound from upperbound" + Environment.NewLine +
-                           "#double: upperbound of the interval" + Environment.NewLine +
-                           "#bracket: open or closed regarding to open or closed interval definition" + Environment.NewLine +
-                           "#Target:Y2 in [0 .. 1.2]" + Environment.NewLine + Environment.NewLine +
-                           "#Constraints on model parameters:" + Environment.NewLine +
-                           "#derivation symbol: d or ∂" + Environment.NewLine +
-                           "#derivation in leibniz notation" + Environment.NewLine +
-                           "#in and interval syntax is the same like above" + Environment.NewLine +
-                           "#∂Y2/∂X1 in [0 .. inf.[" + Environment.NewLine +
-                           "#∂²Y2/∂X1² in [0 .. inf.[" + Environment.NewLine +
-                           "#∂Y2/∂X9 in [-100 .. 0]" + Environment.NewLine +
-                           "#∂²Y2/∂X9² in [0 .. inf.[";
-
       Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
-      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(commentMessage, this)));
+      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
       RegisterParameterEvents();
     }