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

Timestamp:

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

Author:

chaider

Message:

#2971

• Fixes and updates in IntervalConstraintView
• Changed Parser

File:

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

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

@@ -165 +165 @@
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
-
+      
       NamedIntervals namedIntervals = new NamedIntervals();
       foreach (var variable in variables) {
@@ -172 +172 @@
         namedIntervals.Add(variable.Value, variableInterval);
       }
-
+      
       var commentMessage = "#Example of a target variable constraint" + Environment.NewLine +
                            "#F1: TargetVariable" + Environment.NewLine +
@@ -181 +181 @@
                            "#double: upperbound of the interval" + Environment.NewLine +
                            "#bracket: open or closed regarding to open or closed interval definition" + Environment.NewLine +
-                           "#F1 in [0 .. 1.2]" + Environment.NewLine + Environment.NewLine +
+                           "#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 +
-                           "#∂F2/∂X1 in [0 .. inf.[" + Environment.NewLine +
-                           "#∂²F2/∂X1² in [0 .. inf.[" + Environment.NewLine +
-                           "#∂F2/∂X9 in [-100 .. 0]" + Environment.NewLine +
-                           "#∂²F2/∂X9² in [0 .. inf.[";
+                           "#∂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)));
+      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(commentMessage, targetVariable, allowedInputVariables)));
       RegisterParameterEvents();
     }