Changeset 10393 for branches/HeuristicLab.Problems.GPDL/CodeGenerator

Timestamp:

01/24/14 19:44:48 (11 years ago)

Author:

gkronber

Message:

#2026 fixed a bug in the brute force solver

Location:

branches/HeuristicLab.Problems.GPDL/CodeGenerator

Files:

• BruteForceCodeGen.cs (modified) (4 diffs)
• ProblemCodeGen.cs (modified) (1 diff)

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

@@ -31 +31 @@
         }
       } else if(Grammar.subtreeCount[parentState] > 1) {
-        var trees = new IEnumerable<Tree>[Grammar.subtreeCount[parentState]];
-        for(int subtreeIdx = 0; subtreeIdx < Grammar.subtreeCount[parentState]; subtreeIdx++) {
-          trees[subtreeIdx] = GenerateTrees(Grammar.transition[parentState][subtreeIdx], depth - 1);
-        }
-        foreach(var e in CartesianProduct(trees)) {
-          yield return new Tree(-1, e.ToArray()); // altIdx is ignored
+        var nums = Enumerable.Range(1, depth - 1);
+        var depthCombinations = CartesianProduct(Enumerable.Repeat(nums, Grammar.subtreeCount[parentState]))
+           .Where(comb => comb.Max() == depth - 1);
+        foreach(var depthCombination in depthCombinations) {
+          var trees = new IEnumerable<Tree>[Grammar.subtreeCount[parentState]];
+          var depthCombinationEnumerator = depthCombination.GetEnumerator();
+          depthCombinationEnumerator.MoveNext();
+          for(int subtreeIdx = 0; subtreeIdx < Grammar.subtreeCount[parentState]; subtreeIdx++) {
+            trees[subtreeIdx] = GenerateTrees(Grammar.transition[parentState][subtreeIdx], depthCombinationEnumerator.Current);
+            depthCombinationEnumerator.MoveNext();
+          }
+          foreach(var e in CartesianProduct(trees)) {
+            yield return new Tree(-1, e.ToArray()); // altIdx is ignored
+          }
         }
       } 
     }
 
-    public IEnumerable<IEnumerable<Tree>> CartesianProduct(IEnumerable<IEnumerable<Tree>> sets) {
+    public IEnumerable<IEnumerable<T>> CartesianProduct<T>(IEnumerable<IEnumerable<T>> sets) {
       if(sets.Count() == 1) { 
         foreach(var e in sets.First()) {
-          yield return new Tree[] {e};
+          yield return new T[] {e};
         }
       }
@@ -51 +59 @@
         foreach(var e in firstSet) {
           foreach(var p in CartesianProduct(sets.Skip(1))) {
-            yield return new Tree[] {e}.Concat(p);
+            yield return new T[] {e}.Concat(p);
           }
         }
@@ -90 +98 @@
         foreach(var t in GenerateTrees(0, depth)) {
           var f = problem.Evaluate(t);
-          //t.PrintTree(0); Console.WriteLine();
+          // t.PrintTree(0); Console.WriteLine();
           var size = t.GetSize();
           sumSize += size;
@@ -111 +119 @@
           }
         }
+        Console.WriteLine(""n={0}"",n);
       }
     }

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

@@ -149 +149 @@
     private void GenerateSolvers(GPDefNode ast, SourceBuilder solverSourceCode) {
       var grammar = CreateGrammarFromAst(ast);
-      // var randomSearchCodeGen = new RandomSearchCodeGen();
-      // randomSearchCodeGen.Generate(grammar, ast.Terminals.OfType<TerminalNode>(), ast.FitnessFunctionNode.Maximization, solverSourceCode);
+      //var randomSearchCodeGen = new RandomSearchCodeGen();
+      //randomSearchCodeGen.Generate(grammar, ast.Terminals.OfType<TerminalNode>(), ast.FitnessFunctionNode.Maximization, solverSourceCode);
       var bruteForceSearchCodeGen = new BruteForceCodeGen();
       bruteForceSearchCodeGen.Generate(grammar, ast.Terminals.OfType<TerminalNode>(), ast.FitnessFunctionNode.Maximization, solverSourceCode);