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

Timestamp:

05/06/19 13:14:50 (6 years ago)

Author:

chaider

Message:

#2971 Renaming and moving files:

Renamed:

NamedIntervals => IntervalCollection
ParsedConstraint => ProblemDataConstraint
NamedIntervalsView => IntervalCollectionView

Folder Parser => Interval

Moved:

IntervalCollectionView from Regression/IntervalCollectionView ==> ./IntervalCollectionView
Interval, IntervalCollection from /Implementation => /Implementation/Interval

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Implementation/Interval (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser)
• Implementation/Interval/Interval.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs)
• Implementation/Interval/IntervalCollection.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs)
• Implementation/Interval/IntervalConstraint.cs (copied) (copied from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs)
• Implementation/Interval/IntervalConstraintsParser.cs (copied) (copied from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs)
• Implementation/Regression/RegressionProblemData.cs (modified) (4 diffs)
• Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)
• ProblemDataConstraint.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs) (4 diffs)

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

@@ -193 +193 @@
     <Compile Include="Implementation\ConstantModel.cs" />
     <Compile Include="Implementation\DataAnalysisModel.cs" />
-    <Compile Include="Implementation\Interval.cs" />
-    <Compile Include="Implementation\NamedIntervals.cs" />
-    <Compile Include="Implementation\Parser\IntervalConstraint.cs" />
-    <Compile Include="Implementation\Parser\IntervalConstraintsParser.cs" />
+    <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" />
@@ -301 +301 @@
     <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineWeightedClassificationMeanSquaredErrorCalculator.cs" />
-    <Compile Include="ParsedConstraint.cs" />
+    <Compile Include="ProblemDataConstraint.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />

branches/2971_named_intervals/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<NamedIntervals>(VariableRangesParameterName, "", new NamedIntervals()));
-      problemData.Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, "", new ParsedConstraint()));
+      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint()));
       emptyProblemData = problemData;
     }
@@ -111 +111 @@
 
 
-    public IFixedValueParameter<ParsedConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ParsedConstraint>)Parameters[IntervalConstraintsParameterName];
-
-    public ParsedConstraint IntervalConstraints {
+    public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ProblemDataConstraint>)Parameters[IntervalConstraintsParameterName];
+
+    public ProblemDataConstraint IntervalConstraints {
       get => IntervalConstraintsParameter.Value;
       set => IntervalConstraints = value ?? throw new ArgumentNullException("IntervalCosntraint", "The given Constraint is null.");
@@ -158 +158 @@
       }
       if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) { 
-        Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
+        Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
       }
       RegisterParameterEvents();
@@ -196 +196 @@
       
       Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
-      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint(this)));
+      Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
       RegisterParameterEvents();
     }

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

@@ -29 +29 @@
 
     NamedIntervals VariableRanges { get; set; }
-    ParsedConstraint IntervalConstraints { get; set; }
+    ProblemDataConstraint IntervalConstraints { get; set; }
 
     IEnumerable<double> TargetVariableValues { get; }

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

@@ -30 +30 @@
   [StorableType("A56BFB05-8F11-4766-9FBF-20C7010F1CA3")]
   [Item("ParsedConstraint", "Represents parsed constraints.")]
-  public class ParsedConstraint : Item {
+  public class ProblemDataConstraint : Item {
     private static readonly string exampleInput = "# Example for a target variable constraint:" + Environment.NewLine +
                                                   "Target:'y' in [0 .. 100]" + Environment.NewLine + Environment.NewLine +
@@ -53 +53 @@
 
     [StorableConstructor]
-    protected ParsedConstraint(StorableConstructorFlag _) : base(_) { }
+    protected ProblemDataConstraint(StorableConstructorFlag _) : base(_) { }
 
-    protected ParsedConstraint(ParsedConstraint original, Cloner cloner)
+    protected ProblemDataConstraint(ProblemDataConstraint original, Cloner cloner)
       : base(original, cloner) {
       this.Input = original.Input;
@@ -63 +63 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ParsedConstraint(this, cloner);
+      return new ProblemDataConstraint(this, cloner);
     }
 
-    public ParsedConstraint() :base () {
+    public ProblemDataConstraint() :base () {
       this.Input = exampleInput;
       this.constraints = new CheckedItemList<IntervalConstraint>();
@@ -72 +72 @@
     }
 
-    public ParsedConstraint(IRegressionProblemData problemData) : base() {
+    public ProblemDataConstraint(IRegressionProblemData problemData) : base() {
       this.Input = exampleInput;
       this.constraints = new List<IntervalConstraint>();