Changeset 12294 for branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization

Timestamp:

04/08/15 10:09:47 (10 years ago)

Author:

gkronber

Message:

#2283: worked on Q-Learning for poly10

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization

Files:

• Grammar.cs (modified) (1 diff)
• Problems/SymbolicRegressionPoly10Problem.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Grammar.cs

@@ -184 +184 @@
         Debug.Assert(maxLenOfReplacement > 0);
 
-        var alts = GetAlternatives(nt).Where(alt => MinPhraseLength(alt) <= maxLenOfReplacement);
+        var alts = GetTerminalAlternatives(nt).Where(alt => MinPhraseLength(alt) <= maxLenOfReplacement);
         Debug.Assert(alts.Any());
 

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Problems/SymbolicRegressionPoly10Problem.cs

@@ -163 +163 @@
       //   .Concat(new Feature[] { new Feature(CanonicalRepresentation(phrase), 1.0) });
 
-      var partialInterpreter = new PartialExpressionInterpreter();
-      var vars = new double[] { 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, };
-      var s = partialInterpreter.Interpret(phrase, vars);
-      //if (s.Any())
-      //  return new Feature[] { new Feature(s.Pop().ToString(), 1.0), };
-      //else
-      //  return new Feature[] { new Feature("$", 1.0), };
-      return new Feature[] { new Feature(string.Join(",", s), 1.0) };
+      //return new Feature[] { new Feature(phrase, 1.0), };
+
+       var partialInterpreter = new PartialExpressionInterpreter();
+       var vars = new double[] { 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, };
+       var s = partialInterpreter.Interpret(phrase, vars);
+       //if (s.Any())
+       //  return new Feature[] { new Feature(s.Pop().ToString(), 1.0), };
+       //else
+       //  return new Feature[] { new Feature("$", 1.0), };
+       return new Feature[] { new Feature(string.Join(",", s), 1.0) };
     }