Changeset 17958 for trunk/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

04/22/21 14:59:58 (3 years ago)

Author:

gkronber

Message:

#3073: refactoring ShapeConstrainedRegressionProblem as discussed with MKo and CHa

Location:

trunk/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• Implementation/Interval/IShapeConstrainedRegressionProblem.cs (added)
• Implementation/Interval/IShapeConstrainedRegressionProblemData.cs (added)
• Implementation/Interval/ShapeConstrainedRegressionProblem.cs (added)
• Implementation/Interval/ShapeConstrainedRegressionProblemData.cs (added)
• Implementation/Regression/RegressionProblemData.cs (modified) (8 diffs)
• Implementation/Regression/ShapeConstraints.cs (modified) (1 diff)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -143 +143 @@
     <Compile Include="Implementation\Interval\Interval.cs" />
     <Compile Include="Implementation\Interval\IntervalCollection.cs" />
+    <Compile Include="Implementation\Interval\IShapeConstrainedRegressionProblem.cs" />
+    <Compile Include="Implementation\Interval\IShapeConstrainedRegressionProblemData.cs" />
     <Compile Include="Implementation\Interval\ShapeConstraint.cs" />
+    <Compile Include="Implementation\Interval\ShapeConstrainedRegressionProblemData.cs" />
+    <Compile Include="Implementation\Interval\ShapeConstrainedRegressionProblem.cs" />
     <Compile Include="Implementation\Interval\ShapeConstraintsParser.cs" />
     <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -35 +35 @@
     protected const string TargetVariableParameterName = "TargetVariable";
     protected const string VariableRangesParameterName = "VariableRanges";
-    protected const string ShapeConstraintsParameterName = "ShapeConstraints";
     public string Filename { get; set; }
 
@@ -78 +77 @@
       defaultDataset = new Dataset(new string[] { "y", "x" }, kozaF1);
       defaultDataset.Name = "Fourth-order Polynomial Function Benchmark Dataset";
-      defaultDataset.Description = "f(x) = x^4 + x^3 + x^2 + x^1";
+      defaultDataset.Description = "f(x) = x^4 + x^3 + x^2 + x";
       defaultAllowedInputVariables = new List<string>() { "x" };
       defaultTargetVariable = "y";
@@ -94 +93 @@
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
-      problemData.Parameters.Add(new FixedValueParameter<ShapeConstraints>(ShapeConstraintsParameterName, "", new ShapeConstraints()));
       emptyProblemData = problemData;
     }
@@ -101 +99 @@
     #region parameter properties
     public IConstrainedValueParameter<StringValue> TargetVariableParameter => (IConstrainedValueParameter<StringValue>)Parameters[TargetVariableParameterName];
-    public IFixedValueParameter<ShapeConstraints> ShapeConstraintsParameter => (IFixedValueParameter<ShapeConstraints>)Parameters[ShapeConstraintsParameterName];
     public IFixedValueParameter<IntervalCollection> VariableRangesParameter => (IFixedValueParameter<IntervalCollection>)Parameters[VariableRangesParameterName];
     #endregion
@@ -109 +106 @@
       get => VariableRangesParameter.Value;
     }
-
-
-    public ShapeConstraints ShapeConstraints => ShapeConstraintsParameter.Value;
-
 
     public string TargetVariable {
@@ -140 +133 @@
         Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       }
-      if (Parameters.ContainsKey("IntervalConstraints")) {
-        var param = (IFixedValueParameter<ShapeConstraints>)Parameters["IntervalConstraints"];
-        Parameters.Remove(param);
-        Parameters.Add(new FixedValueParameter<ShapeConstraints>(ShapeConstraintsParameterName, param.Value));
-      }
-      if (!Parameters.ContainsKey(ShapeConstraintsParameterName)) {
-        Parameters.Add(new FixedValueParameter<ShapeConstraints>(ShapeConstraintsParameterName, new ShapeConstraints()));
-      }
 
       RegisterParameterEvents();
@@ -174 +159 @@
     public RegressionProblemData(IDataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable,
       IEnumerable<ITransformation> transformations = null,
-      IntervalCollection variableRanges = null,
-      ShapeConstraints shapeConstraints = null)
+      IntervalCollection variableRanges = null)
       : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
@@ -183 +167 @@
       }
       Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
-
-      if (shapeConstraints == null) {
-        shapeConstraints = new ShapeConstraints();
-      }
-      Parameters.Add(new FixedValueParameter<ShapeConstraints>(ShapeConstraintsParameterName, shapeConstraints));
-      RegisterParameterEvents();
     }
     private void RegisterParameterEvents() {
       TargetVariableParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
-      // VariableRanges and ShapeConstraints are fixed parameters
+      // VariableRanges are fixed parameters
     }
     private void Parameter_ValueChanged(object sender, EventArgs e) {

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ShapeConstraints.cs

@@ -77 +77 @@
     public event EventHandler Changed;
 
+
     private void RaiseChanged() {
       var handlers = Changed;

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -29 +29 @@
   public interface IRegressionProblemData : IDataAnalysisProblemData {
     string TargetVariable { get; set; }
-
     IntervalCollection VariableRanges { get; }
-    ShapeConstraints ShapeConstraints { get; }
-
     IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }