Changeset 2635

Timestamp:

01/18/10 10:56:50 (14 years ago)

Author:

gkronber

Message:

Fixed a bug in the network transformation operator and changed test-cases to detect the problem. #833

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs (modified) (2 diffs)
• HeuristicLab.GP.Tests/NetworkToFunctionTransformerTest.cs (modified) (12 diffs)

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

@@ -51 +51 @@
 
       var targetVariableEnumerator = targetVariables.Select(x => x.Data).GetEnumerator();
+      List<IFunctionTree> transformedTrees = new List<IFunctionTree>(Transform(model.FunctionTree, targetVariables.Select(x => x.Data)));
       // create a new sub-scope for each target variable with the transformed expression
-      foreach (IFunctionTree transformedTree in Transform(model.FunctionTree, targetVariables.Select(x => x.Data))) {
+      foreach (IFunctionTree transformedTree in transformedTrees) {
         targetVariableEnumerator.MoveNext();
         Scope exprScope = new Scope();
@@ -72 +73 @@
       // create a new sub-scope for each target variable with the transformed expression
       foreach (var targetVariable in targetVariables) {
-        yield return TransformExpression(boundExpression, targetVariable, targetVariables.Except(new string[] { targetVariable }));
+        yield return TransformExpression((IFunctionTree)boundExpression.Clone(), targetVariable, targetVariables.Except(new string[] { targetVariable }));
       }
     }

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

@@ -113 +113 @@
         IFunctionTree t2 = importer.Import("(- (variable 1.0 a 0) (variable 1.0 b 0))");
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -127 +127 @@
         IFunctionTree t2 = importer.Import("(/ (+ (variable 1.0 a 0) (+ (variable 1.0 b 0) 1.0)) 1.0 )");
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -142 +142 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -160 +160 @@
                                                 (exp (variable 1.0 b 0)))");
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -176 +176 @@
                                                    (exp (exp (variable 1.0 b 0)))) 2.0)");
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -194 +194 @@
                                                    (/ (variable 1.0 b 0) 2.0)) 2.0)");
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -214 +214 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
       });
@@ -229 +229 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
         });
@@ -244 +244 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
         });
@@ -259 +259 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
         });
@@ -274 +274 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
         t0, t1, t2
         });
@@ -290 +290 @@
 
 
-        CompareTrees(actualTrees, new List<IFunctionTree>() {
-        t0, t1, t2
-        });
-      }
-    }
-
-    private void CompareTrees(IEnumerable<IFunctionTree> actual, IEnumerable<IFunctionTree> expected) {
-      var expectedEnumerator = expected.GetEnumerator();
+        CompareTrees(actualTrees.ToList(), new List<IFunctionTree>() {
+        t0, t1, t2
+        });
+      }
+    }
+
+    private void CompareTrees(List<IFunctionTree> actual, List<IFunctionTree> expected) {
+      var expectedEnumerator = expected.GetEnumerator();      
       foreach (var actualTree in actual) {
         if (!expectedEnumerator.MoveNext()) Assert.Fail();