Changeset 16588 for branches

Timestamp:

02/05/19 13:22:33 (5 years ago)

Author:

chaider

Message:

#2971 Changed variableIntervals from ObservableDictionary to Dictionary

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -196 +196 @@
       cancellationTokenSource = new CancellationTokenSource();
       var interpreter = new IntervalInterpreter();
-      //!TODO:
-      //delete this
-      //IntervalConstraintsParser parser = new IntervalConstraintsParser();
-      //var parsed = parser.Parse((Content.ProblemData as RegressionProblemData).IntervalConstraintsParameter.Value.Value);
-      
 
       var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree));
-      var customIntervals = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value;
-      Dictionary<String, Interval> variableRanges = new Dictionary<string, Interval>();
-      foreach (var keyValuePair in customIntervals.VariableIntervals) {
-        variableRanges.Add(keyValuePair.Key, keyValuePair.Value);
-      }
+      var variableRanges = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value.VariableIntervals;
+
       var resultIntervals =  interpreter.GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals);
       try {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

@@ -14 +14 @@
   [StorableClass]
   public class NamedIntervals : Item {   
-    ObservableDictionary<string, Interval> variableIntervals = new ObservableDictionary<string, Interval>();
-    public ObservableDictionary<string, Interval> VariableIntervals => variableIntervals;
+    Dictionary<string, Interval> variableIntervals = new Dictionary<string, Interval>();
+    public Dictionary<string, Interval> VariableIntervals => variableIntervals;
 
     [Storable(Name = "StorableIntervalInformation")]