Ignore:
Timestamp:
04/09/19 14:58:24 (12 months ago)
Author:
chaider
Message:

#2971

  • Fixes and updates in IntervalConstraintView
  • Changed Parser
File:
1 edited

Legend:

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

    r16756 r16773  
    8585    }
    8686
    87     static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
     87    public static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicExpressionTree model,
    8888      IRegressionProblemData problemData) {
    89       //var constraints = IntervalConstraintsParser.Parse(((RegressionProblemData)problemData).IntervalConstraints.Value);
    9089      var constraints = ((RegressionProblemData)problemData).IntervalConstraintsParameter.Value.Constraints;
    9190      var constraintViolations = new Dictionary<IntervalConstraint, bool>();
     
    101100    }
    102101
    103     static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicRegressionModel model,
     102    public static Dictionary<IntervalConstraint, bool> CheckConstraints(ISymbolicRegressionModel model,
    104103      IRegressionProblemData problemData) {
    105104      return CheckConstraints(model.SymbolicExpressionTree, problemData);
    106105    }
    107106
    108     static bool CheckConstraint(ISymbolicExpressionTree model, Dictionary<string, Interval> variableRanges,
     107    public static bool CheckConstraint(ISymbolicExpressionTree model, Dictionary<string, Interval> variableRanges,
    109108      IntervalConstraint constraint) {
    110109      var intervalInterpreter = new IntervalInterpreter();
     
    148147      var constraintViolations = new Dictionary<string, int>();
    149148
    150       //var constraints = IntervalConstraintsParser.Parse(problemData.IntervalConstraints.Value);
    151149      var constraints = problemData.IntervalConstraintsParameter.Value.Constraints;
    152150
Note: See TracChangeset for help on using the changeset viewer.