Changeset 14243 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Timestamp:

08/08/16 13:00:06 (8 years ago)

Author:

gkronber

Message:

#2650: renamed FactorVariable -> BinaryFactorVariable

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (4 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

@@ -205 +205 @@
           ConstantTreeNode constantTreeNode = node as ConstantTreeNode;
           VariableTreeNode variableTreeNode = node as VariableTreeNode;
-          FactorVariableTreeNode factorVariableTreeNode = node as FactorVariableTreeNode;
+          BinaryFactorVariableTreeNode factorVariableTreeNode = node as BinaryFactorVariableTreeNode;
           if (constantTreeNode != null)
             c[i++] = constantTreeNode.Value;
@@ -273 +273 @@
         ConstantTreeNode constantTreeNode = node as ConstantTreeNode;
         VariableTreeNode variableTreeNode = node as VariableTreeNode;
-        FactorVariableTreeNode factorVarTreeNode = node as FactorVariableTreeNode;
+        BinaryFactorVariableTreeNode factorVarTreeNode = node as BinaryFactorVariableTreeNode;
         if (constantTreeNode != null)
           constantTreeNode.Value = constants[i++];
@@ -305 +305 @@
         return true;
       }
-      if (node.Symbol is Variable || node.Symbol is FactorVariable) {
+      if (node.Symbol is Variable || node.Symbol is BinaryFactorVariable) {
         var varNode = node as VariableTreeNodeBase;
-        var factorVarNode = node as FactorVariableTreeNode;
+        var factorVarNode = node as BinaryFactorVariableTreeNode;
         // factor variable values are only 0 or 1 and set in x accordingly
         var par = new AutoDiff.Variable();
@@ -493 +493 @@
         where
          !(n.Symbol is Variable) &&
-         !(n.Symbol is FactorVariable) &&
+         !(n.Symbol is BinaryFactorVariable) &&
          !(n.Symbol is Constant) &&
          !(n.Symbol is Addition) &&