Changeset 17607 for branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis

Timestamp:

06/18/20 11:35:45 (4 years ago)

Author:

chaider

Message:

#3073 Added classes/views to define constraints

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Implementation/Interval/IntervalConstraint.cs (added)
• Implementation/Interval/IntervalConstraintsParser.cs (added)
• Implementation/Regression/RegressionProblemData.cs (modified) (4 diffs)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (3 diffs)
• ProblemDataConstraint.cs (added)

branches/3073_IA_constraint_splitting/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\Regression\ConfidenceBoundRegressionSolution.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
@@ -303 +305 @@
     <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/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)));
       emptyProblemData = problemData;
     }
@@ -107 +108 @@
       get => VariableRangesParameter.Value;
     }
+
+    public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter =>
+      (IFixedValueParameter<ProblemDataConstraint>) Parameters[IntervalConstraintsParameterName];
+
+    public ProblemDataConstraint IntervalConstraints => IntervalConstraintsParameter.Value;
 
 
@@ -140 +146 @@
         Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       }
+
+      if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) {
+        Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
+      }
       RegisterParameterEvents();
     }
@@ -169 +179 @@
       var intervalCollection = CalculateDatasetIntervals(this.Dataset);
       Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
+      Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
       RegisterParameterEvents();
     }

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

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -28 +30 @@
     string TargetVariable { get; set; }
 
-    IntervalCollection VariableRanges { get;}
+    IntervalCollection    VariableRanges      { get; }
+    ProblemDataConstraint IntervalConstraints { get; }
 
-    IEnumerable<double> TargetVariableValues { get; }
+    IEnumerable<double> TargetVariableValues         { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }
-    IEnumerable<double> TargetVariableTestValues { get; }
+    IEnumerable<double> TargetVariableTestValues     { get; }
   }
 }