Changeset 13869

Timestamp:

06/01/16 17:00:19 (8 years ago)

Author:

bburlacu

Message:

#2609: Introduce arity checks before creating autodiff terms in the TryTransformToAutoDiff method.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (7 diffs)

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

@@ -337 +337 @@
       if (node.Symbol is Multiplication) {
         AutoDiff.Term a, b;
-        if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out a) ||
-          !TryTransformToAutoDiff(node.GetSubtree(1), variables, parameters, variableNames, updateVariableWeights, out b)) {
-          term = null;
-          return false;
-        } else {
-          List<AutoDiff.Term> factors = new List<Term>();
-          foreach (var subTree in node.Subtrees.Skip(2)) {
-            AutoDiff.Term f;
-            if (!TryTransformToAutoDiff(subTree, variables, parameters, variableNames, updateVariableWeights, out f)) {
-              term = null;
-              return false;
-            }
-            factors.Add(f);
-          }
-          term = AutoDiff.TermBuilder.Product(a, b, factors.ToArray());
-          return true;
-        }
+        if (node.SubtreeCount == 1) {
+          a = AutoDiff.TermBuilder.Constant(1);
+          if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out b)) {
+            term = null;
+            return false;
+          }
+        } else {
+          if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out a) ||
+              !TryTransformToAutoDiff(node.GetSubtree(1), variables, parameters, variableNames, updateVariableWeights, out b)) {
+            term = null;
+            return false;
+          }
+        }
+        List<AutoDiff.Term> factors = new List<Term>();
+        foreach (var subTree in node.Subtrees.Skip(2)) {
+          AutoDiff.Term f;
+          if (!TryTransformToAutoDiff(subTree, variables, parameters, variableNames, updateVariableWeights, out f)) {
+            term = null;
+            return false;
+          }
+          factors.Add(f);
+        }
+        term = AutoDiff.TermBuilder.Product(a, b, factors.ToArray());
+        return true;
       }
       if (node.Symbol is Division) {
-        // only works for at least two subtrees
         AutoDiff.Term a, b;
-        if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out a) ||
-          !TryTransformToAutoDiff(node.GetSubtree(1), variables, parameters, variableNames, updateVariableWeights, out b)) {
-          term = null;
-          return false;
-        } else {
-          List<AutoDiff.Term> factors = new List<Term>();
-          foreach (var subTree in node.Subtrees.Skip(2)) {
-            AutoDiff.Term f;
-            if (!TryTransformToAutoDiff(subTree, variables, parameters, variableNames, updateVariableWeights, out f)) {
-              term = null;
-              return false;
-            }
-            factors.Add(1.0 / f);
-          }
-          term = AutoDiff.TermBuilder.Product(a, 1.0 / b, factors.ToArray());
-          return true;
-        }
+        if (node.SubtreeCount == 1) {
+          a = AutoDiff.TermBuilder.Constant(1);
+          if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out b)) {
+            term = null;
+            return false;
+          }
+        } else {
+          if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out a) ||
+              !TryTransformToAutoDiff(node.GetSubtree(1), variables, parameters, variableNames, updateVariableWeights, out b)) {
+            term = null;
+            return false;
+          }
+        }
+        List<AutoDiff.Term> factors = new List<Term>();
+        foreach (var subTree in node.Subtrees.Skip(2)) {
+          AutoDiff.Term f;
+          if (!TryTransformToAutoDiff(subTree, variables, parameters, variableNames, updateVariableWeights, out f)) {
+            term = null;
+            return false;
+          }
+          factors.Add(1.0 / f);
+        }
+        term = AutoDiff.TermBuilder.Product(a, 1.0 / b, factors.ToArray());
+        return true;
       }
       if (node.Symbol is Logarithm) {
@@ -405 +418 @@
           return true;
         }
-      } if (node.Symbol is SquareRoot) {
+      }
+      if (node.Symbol is SquareRoot) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {
@@ -414 +428 @@
           return true;
         }
-      } if (node.Symbol is Sine) {
+      }
+      if (node.Symbol is Sine) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {
@@ -423 +438 @@
           return true;
         }
-      } if (node.Symbol is Cosine) {
+      }
+      if (node.Symbol is Cosine) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {
@@ -432 +448 @@
           return true;
         }
-      } if (node.Symbol is Tangent) {
+      }
+      if (node.Symbol is Tangent) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {
@@ -441 +458 @@
           return true;
         }
-      } if (node.Symbol is Erf) {
+      }
+      if (node.Symbol is Erf) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {
@@ -450 +468 @@
           return true;
         }
-      } if (node.Symbol is Norm) {
+      }
+      if (node.Symbol is Norm) {
         AutoDiff.Term t;
         if (!TryTransformToAutoDiff(node.GetSubtree(0), variables, parameters, variableNames, updateVariableWeights, out t)) {