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

Timestamp:

01/13/10 19:31:02 (15 years ago)

Author:

gkronber

Message:

Fixed bugs in network transformation operator. Added test cases. #833.

File:

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

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

@@ -94 +94 @@
         return tree;
       } else if (tree.Function is Flip) {
-        return InvertChain(tree.SubTrees[0]);
+        if (tree.SubTrees[0].Function is OpenParameter) return tree.SubTrees[0];
+        else return ApplyFlips(InvertChain(tree.SubTrees[0]));
       } else {
         IFunctionTree tmp = ApplyFlips(tree.SubTrees[0]);
@@ -134 +135 @@
       }
       // append open param at the end
-      invParent.AddSubTree(openParam);
+      invParent.InsertSubTree(0, openParam);
       return root;
     }
@@ -194 +195 @@
     private static IFunctionTree AppendLeft(IFunctionTree tree, IFunctionTree node) {
       IFunctionTree originalTree = tree;
-      while (tree.SubTrees[0].SubTrees.Count > 0) tree = tree.SubTrees[0];
+      while (!IsBottomLeft(tree)) tree = tree.SubTrees[0];
       tree.InsertSubTree(0, node);
       return originalTree;
+    }
+
+    private static bool IsBottomLeft(IFunctionTree tree) {
+      if(tree.SubTrees.Count==0) return true;
+      else if(tree.SubTrees[0].Function is Variable) return true;
+      else if(tree.SubTrees[0].Function is Constant) return true;
+      else return false;
     }