Changeset 16756

Timestamp:

04/04/19 13:15:58 (5 years ago)

Author:

chaider

Message:

#2971 Changed Interval Constraints View
-Added View for successfully parsed Constraints
-Save Constraints as IntervalConstraints

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.resx (added)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs (added)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs

@@ -59 +59 @@
       OnlineCalculatorError errorState = OnlineCalculatorError.None;
 
-      var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
+      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
+      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
       var intervalInterpreter = new IntervalInterpreter();
       var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs

@@ -59 +59 @@
       OnlineCalculatorError errorState = OnlineCalculatorError.None;
 
-      var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
+      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
+      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
       var intervalInterpreter = new IntervalInterpreter();
       var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

@@ -87 +87 @@
     static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
       IRegressionProblemData problemData) {
-      var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
+      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
+      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
       var constraintViolations = new Dictionary<IntervalConstraint, bool>();
       var variableRanges = ((RegressionProblemData)problemData).VariableRanges.VariableIntervals;
@@ -147 +148 @@
       var constraintViolations = new Dictionary<string, int>();
 
-      var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
+      //var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
+      var constraints = problemData.IntervalConstraintsParameter.Value.Constraints;
 
       if (dataTable.Rows.Count == 0) {

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

@@ -321 +321 @@
       <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ParsedConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ParsedConstraintView.designer.cs">
+      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="ProblemDataView.cs">
@@ -612 +618 @@
     <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx">
       <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ParsedConstraintView.resx">
+      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Regression\NamedIntervalsView.resx">

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

@@ -301 +301 @@
     <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
+    <Compile Include="ParsedConstraint.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

@@ -95 +95 @@
       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()));
+      problemData.Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, "", new ParsedConstraint()));
       emptyProblemData = problemData;
     }
@@ -108 +108 @@
     public NamedIntervals VariableRanges => VariableRangesParameter.Value;
 
-    public IFixedValueParameter<TextValue> IntervalConstraintsParameter => (IFixedValueParameter<TextValue>)Parameters[IntervalConstraintsParameterName];
-    public TextValue IntervalConstraints => IntervalConstraintsParameter.Value;
+    public IFixedValueParameter<ParsedConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ParsedConstraint>)Parameters[IntervalConstraintsParameterName];
+    public ParsedConstraint IntervalConstraints => IntervalConstraintsParameter.Value;
 
     public string TargetVariable {
@@ -192 +192 @@
 
       Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
-      Parameters.Add(new FixedValueParameter<TextValue>(IntervalConstraintsParameterName, new TextValue(commentMessage)));
+      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint()));
       RegisterParameterEvents();
     }