Changeset 17887 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/12/21 14:00:36 (4 years ago)

Author:

gkronber

Message:

#3073: intermediate comment while refactoring the branch

Location:

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Implementation/Interval/Interval.cs (modified) (2 diffs)
• Implementation/Interval/IntervalCollection.cs (modified) (3 diffs)
• Implementation/Interval/IntervalConstraint.cs (deleted)
• Implementation/Interval/IntervalConstraintsParser.cs (deleted)
• Implementation/Interval/ShapeConstraint.cs (added)
• Implementation/Interval/ShapeConstraintsParser.cs (added)
• Implementation/Regression/RegressionProblemData.cs (modified) (5 diffs)
• Implementation/Regression/ShapeConstraints.cs (added)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)
• ProblemDataConstraint.cs (deleted)

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -190 +190 @@
     <Compile Include="Implementation\Interval\Interval.cs" />
     <Compile Include="Implementation\Interval\IntervalCollection.cs" />
-    <Compile Include="Implementation\Interval\IntervalConstraint.cs" />
-    <Compile Include="Implementation\Interval\IntervalConstraintsParser.cs" />
+    <Compile Include="Implementation\Interval\ShapeConstraint.cs" />
+    <Compile Include="Implementation\Interval\ShapeConstraintsParser.cs" />
     <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionSolution.cs" />
+    <Compile Include="Implementation\Regression\ShapeConstraints.cs" />
     <Compile Include="Implementation\Regression\RegressionEnsembleProblemData.cs" />
     <Compile Include="Implementation\Regression\RegressionEnsembleModel.cs">
@@ -306 +307 @@
     <Compile Include="Interfaces\IDataAnalysisModel.cs" />
     <Compile Include="Interfaces\IDataAnalysisProblem.cs" />
-    <Compile Include="ProblemDataConstraint.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

@@ -25 +25 @@
 using HEAL.Attic;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -80 +81 @@
   
       return false;
-    }
-
-    public Tuple<Interval, Interval> Split() {
-      var midpoint = Width / 2;
-      var left     = new Interval(LowerBound, LowerBound + midpoint - double.Epsilon);
-      var right    = new Interval(LowerBound + midpoint, UpperBound);
-      return Tuple.Create(left, right);
-    }
-
-    //Interval Intersection
-    public static Interval operator &(Interval lhs, Interval rhs) {
-      return new Interval(Math.Max(lhs.LowerBound, rhs.LowerBound), Math.Min(lhs.UpperBound, rhs.UpperBound));
-    }
-
-    //Interval Union
-    public static Interval operator |(Interval lhs, Interval rhs) {
-      return new Interval(Math.Min(lhs.LowerBound, rhs.LowerBound), Math.Max(lhs.UpperBound, rhs.UpperBound));
     }
 

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs

@@ -34 +34 @@
       get => HeuristicLab.Common.Resources.VSImageLibrary.Object;
     }
-    private IDictionary<string, Interval> intervals { get; } = new Dictionary<string, Interval>();
 
-    [Storable(Name = "StorableIntervalInformation")]
+    //[Storable]
+    private IDictionary<string, Interval> intervals { get; set; } = new Dictionary<string, Interval>();
+
+    [Storable(OldName = "StorableIntervalInformation")]
     private KeyValuePair<string, double[]>[] StorableIntervalInformation {
+      set {
+        foreach (var varInt in value)
+          intervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
+      }
+    }
+
+    [Storable]
+    private object[] StorableIntervals {
       get {
-        var l = new List<KeyValuePair<string, double[]>>();
-        foreach (var varInt in intervals)
+        var names = intervals.Keys.ToArray();
+        var lowerBounds = intervals.Values.Select(i => i.LowerBound).ToArray();
+        var upperBounds = intervals.Values.Select(i => i.UpperBound).ToArray();
 
-          l.Add(new KeyValuePair<string, double[]>(varInt.Key,
-            new double[] { varInt.Value.LowerBound, varInt.Value.UpperBound }));
-        return l.ToArray();
+        return new object[] { names, lowerBounds, upperBounds };
       }
 
       set {
-        foreach (var varInt in value)
-          intervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
+        var names = (string[])value[0];
+        var lowerBounds = (double[])value[1];
+        var upperBounds = (double[])value[2];
+
+        for (int i = 0; i < names.Length; i++) {
+          intervals.Add(names[i], new Interval(lowerBounds[i], upperBounds[i]));
+        }
       }
     }
@@ -80 +94 @@
     public void SetInterval(string identifier, Interval interval) {
       intervals[identifier] = interval;
+      RaiseChanged();
     }
 
     public void AddInterval(string identifier, Interval interval) {
       intervals.Add(identifier, interval);
+      RaiseChanged();
     }
 
     public void DeleteInterval(string identifier) {
       intervals.Remove(identifier);
+      RaiseChanged();
     }
 
@@ -102 +119 @@
         yield return Tuple.Create(variableInterval.Key, variableInterval.Value);
     }
+
+    public event EventHandler Changed;
+    private void RaiseChanged() {
+      OnChanged();
+      var handler = Changed;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
+
+    protected virtual void OnChanged() {  }
   }
 }

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -94 +94 @@
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
-      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint(problemData)));
+      problemData.Parameters.Add(new FixedValueParameter<ShapeConstraints>(IntervalConstraintsParameterName, "", new ShapeConstraints()));
       emptyProblemData = problemData;
     }
@@ -109 +109 @@
     }
 
-    public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter =>
-      (IFixedValueParameter<ProblemDataConstraint>) Parameters[IntervalConstraintsParameterName];
-
-    public ProblemDataConstraint IntervalConstraints => IntervalConstraintsParameter.Value;
+    public IFixedValueParameter<ShapeConstraints> IntervalConstraintsParameter =>
+      (IFixedValueParameter<ShapeConstraints>) Parameters[IntervalConstraintsParameterName];
+
+    public ShapeConstraints IntervalConstraints => IntervalConstraintsParameter.Value;
 
 
@@ -148 +148 @@
 
       if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) {
-        Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
+        Parameters.Add(new FixedValueParameter<ShapeConstraints>(IntervalConstraintsParameterName, new ShapeConstraints()));
       }
       RegisterParameterEvents();
@@ -173 +173 @@
     }
 
-    public RegressionProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
+    public RegressionProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, 
+      IEnumerable<ITransformation> transformations = null,
+      IntervalCollection variableRanges = null,
+      ShapeConstraints intervalConstraints = null)
       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       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()));
-      var intervalCollection = CalculateDatasetIntervals(this.Dataset);
-      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
-      Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
+      if (variableRanges == null) {
+        variableRanges = CalculateDatasetIntervals(this.Dataset);
+      }
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
+      if (intervalConstraints == null) {
+        intervalConstraints = new ShapeConstraints();
+      } 
+      Parameters.Add(new FixedValueParameter<ShapeConstraints>(IntervalConstraintsParameterName, intervalConstraints));
       RegisterParameterEvents();
     }
@@ -185 +193 @@
     private static IntervalCollection CalculateDatasetIntervals(IDataset dataset) {
       IntervalCollection intervalCollection = new IntervalCollection();
-      foreach (var variable in dataset.DoubleVariables) {// intervals are only possible for double variables
+      foreach (var variable in dataset.DoubleVariables) { // intervals are only possible for double variables
         var variableInterval = Interval.GetInterval(dataset.GetDoubleValues(variable));
         intervalCollection.AddInterval(variable, variableInterval);

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -30 +30 @@
     string TargetVariable { get; set; }
 
-    IntervalCollection    VariableRanges      { get; }
-    ProblemDataConstraint IntervalConstraints { get; }
+    IntervalCollection VariableRanges { get; }
+    ShapeConstraints IntervalConstraints { get; }
 
-    IEnumerable<double> TargetVariableValues         { get; }
+    IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }
-    IEnumerable<double> TargetVariableTestValues     { get; }
+    IEnumerable<double> TargetVariableTestValues { get; }
   }
 }