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

Timestamp:

02/05/19 10:12:59 (6 years ago)

Author:

chaider

Message:

#2971
Added IntervalConstraint Parameter and some fixes

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (3 diffs)
• Implementation/NamedIntervals.cs (modified) (1 diff)
• Implementation/Regression/RegressionProblemData.cs (modified) (5 diffs)

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

@@ -175 +175 @@
     <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\Regression\ConfidenceBoundRegressionSolution.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
@@ -211 +213 @@
     <Compile Include="Interfaces\IDataset.cs" />
     <Compile Include="Interfaces\IDependencyCalculator.cs" />
+    <Compile Include="Interfaces\ITextValue.cs" />
     <Compile Include="Interfaces\ITransformation.cs" />
     <Compile Include="Interfaces\ITransformationMapper.cs" />
@@ -282 +285 @@
     <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\ThresholdCalculator.cs" />
+    <Compile Include="TextValue.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

@@ -15 +15 @@
   public class NamedIntervals : Item {   
     ObservableDictionary<string, Interval> variableIntervals = new ObservableDictionary<string, Interval>();
-    public ObservableDictionary<string, Interval> VariableIntervals {
-      get { return variableIntervals; }
-    }
+    public ObservableDictionary<string, Interval> VariableIntervals => variableIntervals;
 
     [Storable(Name = "StorableIntervalInformation")]

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Mime;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -36 +37 @@
     protected const string TargetVariableParameterName = "TargetVariable";
     protected const string VariableRangesParameterName = "VariableRanges";
+    protected const string IntervalConstraintsParameterName = "IntervalConstraints";
     public string Filename { get; set; }
 
@@ -94 +96 @@
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName,"", new NamedIntervals()));
+      problemData.Parameters.Add(new FixedValueParameter<TextValue>(IntervalConstraintsParameterName, "", new TextValue()));
       emptyProblemData = problemData;
     }
@@ -105 +108 @@
       get { return (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName]; }
     }
+
+    public IFixedValueParameter<TextValue> IntervalConstraintsParameter => (IFixedValueParameter<TextValue>) Parameters[IntervalConstraintsParameterName];
 
     public string TargetVariable {
@@ -168 +173 @@
 
       Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
+      Parameters.Add(new FixedValueParameter<TextValue>(IntervalConstraintsParameterName, new TextValue()));
       RegisterParameterEvents();
     }