Changeset 2630 for trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs

Timestamp:

01/15/10 18:12:47 (14 years ago)

Author:

gkronber

Message:

Fixed bugs in the operator for transformation of networks to closed-form function trees. #833 (Genetic Programming based search for equations (modeling with multiple target variables))

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs

@@ -87 +87 @@
         return tree;
       } else if (tree.Function is Flip) {
-        if (tree.SubTrees[0].Function is OpenParameter) return tree.SubTrees[0];
-        else return InvertChain(ApplyFlips(tree.SubTrees[0]));
+        var partiallyAppliedBranch = ApplyFlips(tree.SubTrees[0]);
+        if (partiallyAppliedBranch.Function is OpenParameter) return partiallyAppliedBranch;
+        else return InvertChain(partiallyAppliedBranch);
       } else {
         List<IFunctionTree> subTrees = new List<IFunctionTree>(tree.SubTrees);
@@ -210 +211 @@
     /// <returns></returns>
     private static IFunctionTree TransformExpression(IFunctionTree tree, string targetVariable, IEnumerable<string> parameters) {
+      if (tree.Function is Variable || tree.Function is Constant || tree.Function is Differential) return tree;
       if (tree.Function is Addition || tree.Function is Subtraction ||
           tree.Function is Multiplication || tree.Function is Division ||
@@ -252 +254 @@
             combinator.AddSubTree(subTrees[i]);
         }
-        if (subTrees[targetIndex].Function is Variable || subTrees[targetIndex].Function is Constant) return combinator;
+        if (subTrees[targetIndex].Function is Variable) return combinator;
         else {
-          IFunctionTree targetChain = InvertF0Chain(subTrees[targetIndex]);
-          AppendLeft(targetChain, combinator);
+          IFunctionTree bottomLeft;
+          IFunctionTree targetChain = InvertF0Chain(subTrees[targetIndex], out bottomLeft);
+          bottomLeft.InsertSubTree(0, combinator);
           return targetChain;
         }
@@ -264 +267 @@
     // precondition: left bottom is a variable (the selected target variable)
     // postcondition: the chain is inverted. the target variable is removed
-    private static IFunctionTree InvertF0Chain(IFunctionTree tree) {
+    private static IFunctionTree InvertF0Chain(IFunctionTree tree, out IFunctionTree bottomLeft) {
       List<IFunctionTree> currentChain = IterateChain(tree).ToList();
 
@@ -286 +289 @@
         }
       }
+      bottomLeft = invParent;
       return root;
     }