Changeset 14761 for branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

03/18/17 12:17:13 (8 years ago)

Author:

gkronber

Message:

#2650 infix formatter also produces factor variable weights, infix parser supports reading of factor variable weights

File:

• branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs

@@ -224 +224 @@
       foreach(var parent in tree.IterateNodesPrefix().ToArray()) {
         for(int i = 0; i < parent.SubtreeCount; i++) {
-          var child = parent.GetSubtree(i) as VariableTreeNode;
-          if(child != null && factorSymbol.VariableNames.Contains(child.VariableName)) {
+          var varChild = parent.GetSubtree(i) as VariableTreeNode;
+          var factorVarChild = parent.GetSubtree(i) as FactorVariableTreeNode;
+          if(varChild != null && factorSymbol.VariableNames.Contains(varChild.VariableName)) {
             parent.RemoveSubtree(i);
             var factorTreeNode = (FactorVariableTreeNode)factorSymbol.CreateTreeNode();
-            factorTreeNode.VariableName = child.VariableName;
+            factorTreeNode.VariableName = varChild.VariableName;
             factorTreeNode.Weights =
-              factorTreeNode.Symbol.GetVariableValues(factorTreeNode.VariableName).Select(_ => 1.0).ToArray(); // weight = 1.0 for each value
+              factorTreeNode.Symbol.GetVariableValues(factorTreeNode.VariableName).Select(_ => 1.0).ToArray();
+            // weight = 1.0 for each value
+            parent.InsertSubtree(i, factorTreeNode);
+          } else if(factorVarChild != null && factorSymbol.VariableNames.Contains(factorVarChild.VariableName)) {
+            if(factorSymbol.GetVariableValues(factorVarChild.VariableName).Count() != factorVarChild.Weights.Length)
+              throw new ArgumentException(
+                string.Format("Factor variable {0} needs exactly {1} weights",
+                factorVarChild.VariableName,
+                factorSymbol.GetVariableValues(factorVarChild.VariableName).Count()));
+            parent.RemoveSubtree(i);
+            var factorTreeNode = (FactorVariableTreeNode)factorSymbol.CreateTreeNode();
+            factorTreeNode.VariableName = factorVarChild.VariableName;
+            factorTreeNode.Weights = factorVarChild.Weights;
             parent.InsertSubtree(i, factorTreeNode);
           }