Changeset 14237 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators

Timestamp:

08/05/16 14:25:28 (8 years ago)

Author:

gkronber

Message:

#2650: work in progress..

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;
           if (constantTreeNode != null)
             c[i++] = constantTreeNode.Value;
           else if (updateVariableWeights && variableTreeNode != null)
             c[i++] = variableTreeNode.Weight;
+          else if (updateVariableWeights && factorVariableTreeNode != null)
+            c[i++] = factorVariableTreeNode.Weight;
         }
       }
@@ -270 +273 @@
         ConstantTreeNode constantTreeNode = node as ConstantTreeNode;
         VariableTreeNode variableTreeNode = node as VariableTreeNode;
+        FactorVariableTreeNode factorVarTreeNode = node as FactorVariableTreeNode;
         if (constantTreeNode != null)
           constantTreeNode.Value = constants[i++];
         else if (updateVariableWeights && variableTreeNode != null)
           variableTreeNode.Weight = constants[i++];
+        else if (updateVariableWeights && factorVarTreeNode != null)
+          factorVarTreeNode.Weight = constants[i++];
       }
     }
@@ -299 +305 @@
         return true;
       }
-      if (node.Symbol is Variable) {
-        var varNode = node as VariableTreeNode;
+      if (node.Symbol is Variable || node.Symbol is FactorVariable) {
+        var varNode = node as VariableTreeNodeBase;
+        var factorVarNode = node as FactorVariableTreeNode;
+        // factor variable values are only 0 or 1 and set in x accordingly
         var par = new AutoDiff.Variable();
         parameters.Add(par);
         variableNames.Add(varNode.VariableName);
-        categoricalVariableValues.Add(string.Empty);   // as a value as placeholder (variableNames.Length == catVariableValues.Length)
+        categoricalVariableValues.Add(factorVarNode != null ? factorVarNode.VariableValue : string.Empty);
 
         if (updateVariableWeights) {
@@ -313 +321 @@
           term = par;
         }
-        return true;
-      }
-      if (node.Symbol is FactorVariable) {
-        // nothing to update in this case (like a variable without a weight)
-        // values are only 0 or 1 and set in x accordingly
-        var factorNode = node as FactorVariableTreeNode;
-        var par = new AutoDiff.Variable();
-        parameters.Add(par);
-        variableNames.Add(factorNode.VariableName);
-        categoricalVariableValues.Add(factorNode.VariableValue);
-        term = par;
         return true;
       }