Changeset 16756


Ignore:
Timestamp:
04/04/19 13:15:58 (2 weeks 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:
4 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs

    r16713 r16756  
    5959      OnlineCalculatorError errorState = OnlineCalculatorError.None;
    6060
    61       var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
     61      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
     62      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
    6263      var intervalInterpreter = new IntervalInterpreter();
    6364      var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs

    r16713 r16756  
    5959      OnlineCalculatorError errorState = OnlineCalculatorError.None;
    6060
    61       var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
     61      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Value);
     62      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
    6263      var intervalInterpreter = new IntervalInterpreter();
    6364      var variableRanges = ((RegressionProblemData)problemData).VariableRangesParameter.Value.VariableIntervals;
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

    r16747 r16756  
    8787    static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
    8888      IRegressionProblemData problemData) {
    89       var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
     89      //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
     90      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
    9091      var constraintViolations = new Dictionary<IntervalConstraint, bool>();
    9192      var variableRanges = ((RegressionProblemData)problemData).VariableRanges.VariableIntervals;
     
    147148      var constraintViolations = new Dictionary<string, int>();
    148149
    149       var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
     150      //var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
     151      var constraints = problemData.IntervalConstraintsParameter.Value.Constraints;
    150152
    151153      if (dataTable.Rows.Count == 0) {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r16685 r16756  
    321321      <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
    322322    </Compile>
     323    <Compile Include="ParsedConstraintView.cs">
     324      <SubType>UserControl</SubType>
     325    </Compile>
     326    <Compile Include="ParsedConstraintView.designer.cs">
     327      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
     328    </Compile>
    323329    <Compile Include="Plugin.cs" />
    324330    <Compile Include="ProblemDataView.cs">
     
    612618    <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx">
    613619      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     620    </EmbeddedResource>
     621    <EmbeddedResource Include="ParsedConstraintView.resx">
     622      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
    614623    </EmbeddedResource>
    615624    <EmbeddedResource Include="Regression\NamedIntervalsView.resx">
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r16685 r16756  
    301301    <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
    302302    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
     303    <Compile Include="ParsedConstraint.cs" />
    303304    <Compile Include="Plugin.cs" />
    304305    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16731 r16756  
    9595      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
    9696      problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, "", new NamedIntervals()));
    97       problemData.Parameters.Add(new FixedValueParameter<TextValue>(IntervalConstraintsParameterName, "", new TextValue()));
     97      problemData.Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, "", new ParsedConstraint()));
    9898      emptyProblemData = problemData;
    9999    }
     
    108108    public NamedIntervals VariableRanges => VariableRangesParameter.Value;
    109109
    110     public IFixedValueParameter<TextValue> IntervalConstraintsParameter => (IFixedValueParameter<TextValue>)Parameters[IntervalConstraintsParameterName];
    111     public TextValue IntervalConstraints => IntervalConstraintsParameter.Value;
     110    public IFixedValueParameter<ParsedConstraint> IntervalConstraintsParameter => (IFixedValueParameter<ParsedConstraint>)Parameters[IntervalConstraintsParameterName];
     111    public ParsedConstraint IntervalConstraints => IntervalConstraintsParameter.Value;
    112112
    113113    public string TargetVariable {
     
    192192
    193193      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
    194       Parameters.Add(new FixedValueParameter<TextValue>(IntervalConstraintsParameterName, new TextValue(commentMessage)));
     194      Parameters.Add(new FixedValueParameter<ParsedConstraint>(IntervalConstraintsParameterName, new ParsedConstraint()));
    195195      RegisterParameterEvents();
    196196    }
Note: See TracChangeset for help on using the changeset viewer.