Changeset 16904 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Timestamp:

05/07/19 12:09:34 (6 years ago)

Author:

chaider

Message:

#2971 Renamed NamedIntervals to IntervalCollection

Location:

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

Files:

• Implementation/Interval/IntervalCollection.cs (modified) (3 diffs)
• Implementation/Regression/RegressionProblemData.cs (modified) (4 diffs)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs

@@ -28 +28 @@
   [Item("NamedIntervals", "Represents variables with their interval ranges.")]
   [StorableType("230B4E4B-41E5-4D33-9BC3-E2DAADDCA5AE")]
-  public class NamedIntervals : Item {
+  public class IntervalCollection : Item {
     public static new System.Drawing.Image StaticItemImage {
       get => HeuristicLab.Common.Resources.VSImageLibrary.Object;
@@ -51 +51 @@
     }
 
-    public NamedIntervals() : base() { }
+    public IntervalCollection() : base() { }
     [StorableConstructor]
-    protected NamedIntervals(StorableConstructorFlag _) : base(_) { }
+    protected IntervalCollection(StorableConstructorFlag _) : base(_) { }
 
-    protected NamedIntervals(NamedIntervals original, Cloner cloner) : base(original, cloner) {
+    protected IntervalCollection(IntervalCollection original, Cloner cloner) : base(original, cloner) {
       foreach (var keyValuePair in original.VariableIntervals) {
         VariableIntervals.Add(keyValuePair.Key, new Interval(keyValuePair.Value.LowerBound, keyValuePair.Value.UpperBound));
@@ -62 +62 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new NamedIntervals(this, cloner);
+      return new IntervalCollection(this, cloner);
     }
 

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

@@ -93 +93 @@
       problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
-      problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, "", new NamedIntervals()));
+      problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
       problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint()));
       emptyProblemData = problemData;
@@ -103 +103 @@
     }
 
-    public IFixedValueParameter<NamedIntervals> VariableRangesParameter => (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName];
-
-    public NamedIntervals VariableRanges {
+    public IFixedValueParameter<IntervalCollection> VariableRangesParameter => (IFixedValueParameter<IntervalCollection>)Parameters[VariableRangesParameterName];
+
+    public IntervalCollection VariableRanges {
       get => VariableRangesParameter.Value;
       set => VariableRanges = value ?? throw new ArgumentNullException("Variable Ranges", "The given variable ranges are null");
@@ -148 +148 @@
       if (!Parameters.ContainsKey(VariableRangesParameterName)) {
         var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
-        NamedIntervals namedIntervals = new NamedIntervals();
+        IntervalCollection intervalCollection = new IntervalCollection();
         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);
+          intervalCollection.VariableIntervals.Add(variable.Value, variableInterval);
         }
 
-        Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
+        Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       }
       if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) { 
@@ -187 +187 @@
       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();
+
+      IntervalCollection intervalCollection = new IntervalCollection();
       foreach (var variable in variables) {
         if (!dataset.DoubleVariables.Contains(variable.Value)) continue; // intervals are only possible for double variables
         var variableInterval = Interval.GetInterval(dataset.GetDoubleValues(variable.Value));
-        namedIntervals.VariableIntervals.Add(variable.Value, variableInterval);
+        intervalCollection.VariableIntervals.Add(variable.Value, variableInterval);
       }
       
-      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
       RegisterParameterEvents();

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -28 +28 @@
     string TargetVariable { get; set; }
 
-    NamedIntervals VariableRanges { get; set; }
+    IntervalCollection VariableRanges { get; set; }
     ProblemDataConstraint IntervalConstraints { get; set; }