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

Timestamp:

05/20/20 08:52:25 (4 years ago)

Author:

chaider

Message:

#2971 Removed constraint related parts from branch

Location:

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

Files:

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

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

@@ -191 +191 @@
     <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" />
@@ -297 +295 @@
     <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineWeightedClassificationMeanSquaredErrorCalculator.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/Interval/Interval.cs

@@ -263 +263 @@
 
       return new Interval(Math.Pow(a.LowerBound, 1.0 / higher), Math.Pow(a.UpperBound, 1.0 / lower));
+      
     }
 
@@ -285 +286 @@
       if (a.Contains(0.0)) {
         min = 0.0;
-    }
+      }
 
       return new Interval(min, max);

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<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
-      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint(problemData)));
       emptyProblemData = problemData;
     }
@@ -107 +106 @@
     public IntervalCollection VariableRanges {
       get => VariableRangesParameter.Value;
-    }
-
-
-    public IFixedValueParameter<ProblemDataConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ProblemDataConstraint>)Parameters[IntervalConstraintsParameterName];
-
-    public ProblemDataConstraint IntervalConstraints {
-      get => IntervalConstraintsParameter.Value;
     }
 
@@ -148 +140 @@
         Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, intervalCollection));
       }
-      if (!Parameters.ContainsKey(IntervalConstraintsParameterName)) { 
-        Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, new ProblemDataConstraint(this)));
-      }
       RegisterParameterEvents();
     }
@@ -180 +169 @@
       var intervalCollection = CalculateDatasetIntervals(this.Dataset);
       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

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