Changeset 16884 for branches/2971_named_intervals

Timestamp:

05/02/19 12:01:12 (6 years ago)

Author:

chaider

Message:

#2971 fixed storable problem within RegressionProblemData

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)
• ParsedConstraint.cs (modified) (2 diffs)

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

@@ -146 +146 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
-      NamedIntervals namedIntervals = new NamedIntervals();
-      foreach (var variable in variables) {
-        if (!this.Dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
-        var variableInterval = Interval.GetInterval(this.Dataset.GetDoubleValues(variable.Value));
-        namedIntervals.VariableIntervals.Add(variable.Value, variableInterval);
-      }
-
-      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
-      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
+      if (!Parameters.ContainsKey(VariableRangesParameterName)) {
+        var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
+        NamedIntervals namedIntervals = new NamedIntervals();
+        foreach (var variable in variables) {
+          if (!this.Dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
+          var variableInterval = Interval.GetInterval(this.Dataset.GetDoubleValues(variable.Value));
+          namedIntervals.VariableIntervals.Add(variable.Value, variableInterval);
+        }
+
+        Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
+      }
+      if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) { 
+        Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
+      }
       RegisterParameterEvents();
     }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs

@@ -31 +31 @@
   [Item("ParsedConstraint", "Represents parsed constraints.")]
   public class ParsedConstraint : Item {
-    private static readonly string exampleInput = "#Example for a target variable constraint:" + Environment.NewLine +
+    private static readonly string exampleInput = "# Example for a target variable constraint:" + Environment.NewLine +
                                                   "Target:'y' in [0 .. 100]" + Environment.NewLine + Environment.NewLine +
-                                                  "#Example for constraint on model parameter: " + Environment.NewLine +
+                                                  "# Example for constraint on model parameter: " + Environment.NewLine +
                                                   "d'y'/d'x' in [0 .. 10]" + Environment.NewLine +
                                                   "\u2202²'y'/\u2202'x'² in ]-1 .. inf.[";
-      
+     
+    [Storable]
     public string Input { get; set; }
 
     private IEnumerable<IntervalConstraint> constraints;
+    [Storable]
     public IEnumerable<IntervalConstraint> Constraints {
       get => constraints;
@@ -46 +48 @@
         OnChanged(EventArgs.Empty);
       }
-  }
-    public IRegressionProblemData ProblemData { get; set; }
+    }
+    [Storable]
+    public IRegressionProblemData ProblemData { get; private set; }
 
     [StorableConstructor]