Changeset 17510

Timestamp:

04/14/20 14:55:23 (5 years ago)

Author:

chaider

Message:

#2971

• Changed constraint violation table to ResultParameter
• Changed symbol check to include DerivativeCalculator symbols
• Moved SymbolicRegressionConstraintAnalyzer to plugins root
• Added Power and Root to IntervalInterpreter

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (1 diff)

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

@@ -199 +199 @@
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs" />
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs" />
-    <Compile Include="SingleObjective\SymbolicRegressionConstraintAnalyzer.cs" />
+    <Compile Include="SymbolicRegressionConstraintAnalyzer.cs" />
     <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />

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

@@ -38 +38 @@
     private const string ConstraintViolationsResultName = "Constraint Violations";
     private const string ProblemDataParameterName = "ProblemData";
+    private const string ConstraintViolationParameterName = "ConstraintViolations";
 
     #region parameter properties
@@ -43 +44 @@
       get { return (ILookupParameter<IRegressionProblemData>) Parameters[ProblemDataParameterName]; }
     }
+
+    public IResultParameter<DataTable> ConstraintViolationParameter =>
+      (IResultParameter<DataTable>) Parameters[ConstraintViolationParameterName];
     #endregion
 
@@ -60 +64 @@
     public SymbolicRegressionConstraintAnalyzer() : base(){
       Parameters.Add(new LookupParameter<IRegressionProblemData>(ProblemDataParameterName, "The problem data of the symbolic data analysis problem."));
+      Parameters.Add(new ResultParameter<DataTable>(ConstraintViolationParameterName, "Shows the number of constraint violations!"));
+      ConstraintViolationParameter.DefaultValue = new DataTable(ConstraintViolationParameterName) {
+        VisualProperties = {
+          XAxisTitle = "Generations",
+          YAxisTitle = "Constraint Violations",
+        }
+      };
     }
 
@@ -73 +84 @@
       var constraints = problemData.IntervalConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetIntervals();
+      var newDataTable = ConstraintViolationParameter.ActualValue;
 
-      if (!results.ContainsKey(ConstraintViolationsResultName)) {
-        var newDataTable = new DataTable(ConstraintViolationsResultName);
-          foreach (var constraint in constraints) {
-              newDataTable.Rows.Add(new DataRow(constraint.Expression));
+      if(newDataTable.Rows.Count == 0) { 
+        foreach (var constraint in constraints) {
+          newDataTable.Rows.Add(new DataRow(constraint.Expression));
         }
-        results.Add(new Result(ConstraintViolationsResultName, "Chart displaying the constraint violations.", newDataTable));
       }
-      var dataTable = (DataTable)results[ConstraintViolationsResultName].Value;
 
       var interpreter = new IntervalInterpreter();
       foreach (var constraint in constraints) {
-        int violations = 0;
-        foreach (var tree in trees) {
-          var satisfied = SymbolicRegressionConstraintAnalyzer.ConstraintSatisfied(constraint, interpreter, variableRanges, tree);
-          if (!satisfied) violations++;
-        }
-        dataTable.Rows[constraint.Expression].Values.Add(violations);
+        var violations = trees.Select(tree => SymbolicRegressionConstraintAnalyzer.ConstraintSatisfied(constraint, interpreter, variableRanges, tree)).Count(satisfied => !satisfied);
+        newDataTable.Rows[constraint.Expression].Values.Add(violations);
       }
       
-
       return base.Apply();
     }
@@ -110 +114 @@
         var tree = solution;
         for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
-          tree = DerivativeCalculator.Derive(tree, constraint.Variable);
+            tree = DerivativeCalculator.Derive(tree, constraint.Variable);
         }
         resultInterval = intervalInterpreter.GetSymbolicExpressionTreeInterval(tree, variableRanges);

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

@@ -176 +176 @@
 
       //Check if the tree contains unknown symbols for the interval calculation
-      if (IntervalInterpreter.IsCompatible(Model.SymbolicExpressionTree))
+      if (IntervalInterpreter.IsCompatible(Model.SymbolicExpressionTree) && DerivativeCalculator.IsCompatible(Model.SymbolicExpressionTree))
         ModelBoundsCollection = CalculateModelIntervals(this);
     }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -211 +211 @@
         }
 
-        if (IntervalInterpreter.IsCompatible(tree)) { 
+        if (IntervalInterpreter.IsCompatible(tree) && DerivativeCalculator.IsCompatible(tree)) { 
           var regressionProblemData = Content.ProblemData as IRegressionProblemData;
           if (regressionProblemData != null) {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -308 +308 @@
           !(n.Symbol is Logarithm) &&
           !(n.Symbol is Exponential) &&
-          //!(n.Symbol is Power) && //Interval Contains the symbol power, but the DerivativeCalculator does not!
+          !(n.Symbol is Power) && //Interval Contains the symbol power, but the DerivativeCalculator does not!
           !(n.Symbol is Square) &&
-          //!(n.Symbol is Root) && //Interval Contains the symbol root, but the DerivativeCalculator does not!
+          !(n.Symbol is Root) && //Interval Contains the symbol root, but the DerivativeCalculator does not!
           !(n.Symbol is SquareRoot) &&
           !(n.Symbol is Problems.DataAnalysis.Symbolic.Variable) &&