Changeset 10394 for branches/HeuristicLab.Problems.GPDL/CodeGenerator/BruteForceCodeGen.cs

Timestamp:

01/24/14 20:07:33 (10 years ago)

Author:

gkronber

Message:

#2026 fixed a bug in generation of terminal nodes

File:

• branches/HeuristicLab.Problems.GPDL/CodeGenerator/BruteForceCodeGen.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GPDL/CodeGenerator/BruteForceCodeGen.cs

@@ -106 +106 @@
           if (problem.IsBetter(f, bestF)) {
             bestF = f;
+            t.PrintTree(0); Console.WriteLine();
             Console.WriteLine(""{0}\t{1}\t(size={2}, depth={3})"", n, bestF, size, depth);
           }
@@ -153 +154 @@
           sb.AppendFormat("t = new {0}Tree();", terminal.Ident).AppendLine();
 
-          foreach (var constr in terminal.Constraints.Reverse()) {
-            sb.AppendFormat("t.{0} = {0};", constr.Ident).EndBlock();
-            sb.AppendLine("}");
+          foreach (var constr in terminal.Constraints) {
+            sb.AppendFormat("t.{0} = {0};", constr.Ident);
+          }
+          sb.AppendLine("yield return t; ");
+
+          foreach (var _ in terminal.Constraints) {
+            sb.AppendLine("}").EndBlock();
           }
 
-          sb.AppendLine("yield return t; ").EndBlock();
 
           sb.AppendLine(" break; }");