Changeset 2624 for trunk/sources/HeuristicLab.GP.Tests/NetworkToFunctionTransformerTest.cs

Timestamp:

01/13/10 15:43:55 (15 years ago)

Author:

gkronber

Message:

Rewrote part of network transformation code. #833 (Genetic Programming based search for equations (modeling with multiple target variables))

File:

• trunk/sources/HeuristicLab.GP.Tests/NetworkToFunctionTransformerTest.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.Tests/NetworkToFunctionTransformerTest.cs

@@ -85 +85 @@
       IFunctionTree expected = log.GetTreeNode(); expected.AddSubTree(param.GetTreeNode());
       IFunctionTree actual;
-      actual = NetworkToFunctionTransformer_Accessor.InvertFunction(tree);
+      actual = NetworkToFunctionTransformer_Accessor.InvertChain(tree);
       var e = (from x in FunctionTreeIterator.IteratePostfix(expected)
                select x.Function.GetType()).GetEnumerator();
@@ -121 +121 @@
         IEnumerable<IFunctionTree> actualTrees = NetworkToFunctionTransformer_Accessor.Transform(tree, new List<string>() { "a", "b", "c" });
 
-        IFunctionTree t0 = importer.Import("(- (+ 1.0 (variable 1.0 b 0)) (* 1.0 (variable 1.0 c 0)))");
-        IFunctionTree t1 = importer.Import("(- (+ (variable 1.0 a 0) (* 1.0 (variable 1.0 c 0) 1.0)))");
-        IFunctionTree t2 = importer.Import("(/ (+ (variable 1.0 a 0) (+ 1.0 (variable 1.0 b 0) 1.0)))");
+        IFunctionTree t0 = importer.Import("(- (+ (variable 1.0 b 0) 1.0) (* (variable 1.0 c 0) 1.0 ))");
+        IFunctionTree t1 = importer.Import("(- (+ (variable 1.0 a 0) (* (variable 1.0 c 0) 1.0)) 1.0 )");
+        IFunctionTree t2 = importer.Import("(/ (+ (variable 1.0 a 0) (+ (variable 1.0 b 0) 1.0)) 1.0 )");
 
         CompareTrees(actualTrees, new List<IFunctionTree>() {