Changeset 10394

Timestamp:

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

Author:

gkronber

Message:

#2026 fixed a bug in generation of terminal nodes

Location:

branches/HeuristicLab.Problems.GPDL

Files:

• CodeGenerator/BruteForceCodeGen.cs (modified) (2 diffs)
• CodeGenerator/ProblemCodeGen.cs (modified) (2 diffs)
• Examples/symbreg Koza.txt (modified) (1 diff)
• HeuristicLab.Problems.GPDL.sln (modified) (1 diff)

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; }");

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

@@ -76 +76 @@
       else return 1 + subtrees.Max(t=>t.GetDepth());
     }
-    public void PrintTree(int curState) {
+    public virtual void PrintTree(int curState) {
       Console.Write(""{0} "", Grammar.symb[curState]);
       if(subtrees != null) {
@@ -254 +254 @@
       }
       sb.AppendFormat(" public {0}Tree() : base() {{ }}", terminal.Ident).AppendLine();
+      sb.AppendLine(@"
+          public override void PrintTree(int curState) {
+            Console.Write(""{0} "", Grammar.symb[curState]);");
+      foreach (var att in terminal.FieldDefinitions) {
+        sb.AppendFormat("Console.Write(\"{{0}} \", {0});", att.Identifier).AppendLine();
+      }
+
+      sb.AppendLine("}");
+
       sb.AppendLine("}");
     }

branches/HeuristicLab.Problems.GPDL/Examples/symbreg Koza.txt

@@ -57 +57 @@
   int n = 500;
   variableNames = new string[] {"x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10" };
-  var rand = new System.Random();
+  var rand = new System.Random(31415);
   x = new double[n, 10];
   y = new double[n];

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln

@@ -116 +116 @@
     {E2060931-6700-464B-9E82-50846D7AE4E9} = {3768D612-38EB-47D8-9E79-75D8E5AB00A8}
   EndGlobalSection
-  GlobalSection(Performance) = preSolution
-    HasPerformanceSessions = true
-  EndGlobalSection
 EndGlobal