Changeset 17914

Timestamp:

03/24/21 10:13:04 (4 years ago)

Author:

chaider

Message:

#3073 Fixed check for scaling nodes in ConstraintsEvaluators

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• MultiObjective/NMSEConstraintsEvaluator.cs (modified) (2 diffs)
• SingleObjective/Evaluators/NMSEConstraintsEvaluator.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/NMSEConstraintsEvaluator.cs

@@ -109 +109 @@
       } else {
         if (applyLinearScaling) {
-          //Check for interval arithmetic grammar
-          if (!(tree.Root.Grammar is IntervalArithmeticGrammar))
-            throw new ArgumentException($"{ItemName} can only be used with IntervalArithmeticGrammar.");
-
           var rootNode = new ProgramRootSymbol().CreateTreeNode();
           var startNode = new StartSymbol().CreateTreeNode();
@@ -118 +114 @@
                                 .GetSubtree(0); //Offset
           var scaling = offset.GetSubtree(0);
+
+          //Check if tree contains offset and scaling nodes
+          if (!(offset.Symbol is Addition) || !(scaling.Symbol is Multiplication))
+            throw new ArgumentException($"{ItemName} can only be used with IntervalArithmeticGrammar.");
+
+
           var t = (ISymbolicExpressionTreeNode)scaling.GetSubtree(0).Clone();
           rootNode.AddSubtree(startNode);

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSEConstraintsEvaluator.cs

@@ -132 +132 @@
       } else {
         if (applyLinearScaling) {
-          //Check for interval arithmetic grammar
-          if (!(tree.Root.Grammar is IntervalArithmeticGrammar))
-            throw new ArgumentException($"{ItemName} can only be used with IntervalArithmeticGrammar.");
-
           var rootNode = new ProgramRootSymbol().CreateTreeNode();
           var startNode = new StartSymbol().CreateTreeNode();
@@ -141 +137 @@
                                 .GetSubtree(0); //Offset
           var scaling = offset.GetSubtree(0);
+
+          //Check if tree contains offset and scaling nodes
+          if (!(offset.Symbol is Addition) || !(scaling.Symbol is Multiplication))
+            throw new ArgumentException($"{ItemName} can only be used with IntervalArithmeticGrammar.");
+
           var t = (ISymbolicExpressionTreeNode)scaling.GetSubtree(0).Clone();
           rootNode.AddSubtree(startNode);