Changeset 16588


Ignore:
Timestamp:
02/05/19 13:22:33 (2 months ago)
Author:
chaider
Message:

#2971 Changed variableIntervals from ObservableDictionary to Dictionary

Location:
branches/2971_named_intervals
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

    r16586 r16588  
    196196      cancellationTokenSource = new CancellationTokenSource();
    197197      var interpreter = new IntervalInterpreter();
    198       //!TODO:
    199       //delete this
    200       //IntervalConstraintsParser parser = new IntervalConstraintsParser();
    201       //var parsed = parser.Parse((Content.ProblemData as RegressionProblemData).IntervalConstraintsParameter.Value.Value);
    202      
    203198
    204199      var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree));
    205       var customIntervals = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value;
    206       Dictionary<String, Interval> variableRanges = new Dictionary<string, Interval>();
    207       foreach (var keyValuePair in customIntervals.VariableIntervals) {
    208         variableRanges.Add(keyValuePair.Key, keyValuePair.Value);
    209       }
     200      var variableRanges = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value.VariableIntervals;
     201
    210202      var resultIntervals =  interpreter.GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals);
    211203      try {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

    r16586 r16588  
    1414  [StorableClass]
    1515  public class NamedIntervals : Item {   
    16     ObservableDictionary<string, Interval> variableIntervals = new ObservableDictionary<string, Interval>();
    17     public ObservableDictionary<string, Interval> VariableIntervals => variableIntervals;
     16    Dictionary<string, Interval> variableIntervals = new Dictionary<string, Interval>();
     17    public Dictionary<string, Interval> VariableIntervals => variableIntervals;
    1818
    1919    [Storable(Name = "StorableIntervalInformation")]
Note: See TracChangeset for help on using the changeset viewer.