Changeset 10384 for branches/HeuristicLab.Problems.GPDL/CodeGenerator/ProblemCodeGen.cs

Timestamp:

01/22/14 18:09:44 (11 years ago)

Author:

gkronber

Message:

#2026 fixed random search code generation

File:

• branches/HeuristicLab.Problems.GPDL/CodeGenerator/ProblemCodeGen.cs (modified) (10 diffs)

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

@@ -33 +33 @@
 
   // generic interface for communication from problem interpretation to solver
-  public interface ISolverState {
-    void Reset();
-    int PeekNextAlternative(); // in alternative nodes returns the index of the alternative that should be followed
-    void Follow(int idx); // next: derive the NT symbol with index=idx;
-    void Unwind(); // finished with deriving the NT symbol
-  }
+  // public interface ISolverState {
+  //   void Reset();
+  //   int PeekNextAlternative(); // in alternative nodes returns the index of the alternative that should be followed
+  //   void Follow(int idx); // next: derive the NT symbol with index=idx;
+  //   void Unwind(); // finished with deriving the NT symbol
+  // }
 
   public sealed class ?IDENT?Problem {
@@ -53 +53 @@
     }
 
-    private ISolverState _state;
-    public double Evaluate(ISolverState _state) {
-      this._state = _state;
+    private Tree _t;
+    public double Evaluate(Tree _t) {
+      this._t = _t;
 #region objective function (MINIMIZE / MAXIMIZE section)
 ?FITNESSFUNCTION?
@@ -216 +216 @@
       sb.AppendFormat("public class {0}Tree : Tree {{", terminal.Ident).BeginBlock();
       foreach (var att in terminal.FieldDefinitions) {
-        sb.AppendFormat("{0} {1};", att.Type, att.Identifier).AppendLine();
+        sb.AppendFormat("public {0} {1};", att.Type, att.Identifier).AppendLine();
       }
       sb.AppendFormat(" public {0}Tree(Random random, ?IDENT?Problem problem) : base() {{", terminal.Ident).BeginBlock();
@@ -222 +222 @@
         if (constr.Type == ConstraintNodeType.Set) {
           sb.AppendLine("{").BeginBlock();
-          sb.AppendFormat(" var elements = problem.GetAllowed{0}_{1}().ToArray();", terminal.Ident, constr.Ident).AppendLine();
+          sb.AppendFormat("var elements = problem.GetAllowed{0}_{1}().ToArray();", terminal.Ident, constr.Ident).AppendLine();
           sb.AppendFormat("{0} = elements[random.Next(elements.Length)]; ", constr.Ident).AppendLine();
           sb.AppendLine("}").EndBlock();
@@ -229 +229 @@
           sb.AppendFormat(" var max = problem.GetMax{0}_{1}();", terminal.Ident, constr.Ident).AppendLine();
           sb.AppendFormat(" var min = problem.GetMin{0}_{1}();", terminal.Ident, constr.Ident).AppendLine();
-          sb.AppendFormat("{0} = random.NextDouble() * (max - min) + min ", constr.Ident).AppendLine();
+          sb.AppendFormat("{0} = random.NextDouble() * (max - min) + min;", constr.Ident).AppendLine();
           sb.AppendLine("}").EndBlock();
         }
@@ -268 +268 @@
       else
         actualParameter = string.Empty;
-      sb.AppendLine("_state.Reset();");
-      sb.AppendFormat("{0}(_state, {1});", s.Name, actualParameter).AppendLine();
+      sb.AppendFormat("{0}(_t, {1});", s.Name, actualParameter).AppendLine();
       sb.AppendLine("}").EndBlock();
     }
@@ -275 +274 @@
     private void GenerateInterpreterMethod(AttributedGrammar g, ISymbol s, SourceBuilder sb) {
       if (!s.Attributes.Any())
-        sb.AppendFormat("private void {0}(ISolverState _state) {{", s.Name).BeginBlock();
+        sb.AppendFormat("private void {0}(Tree _t) {{", s.Name).BeginBlock();
       else
-        sb.AppendFormat("private void {0}(ISolverState _state, {1}) {{", s.Name, s.GetAttributeString()).BeginBlock();
+        sb.AppendFormat("private void {0}(Tree _t, {1}) {{", s.Name, s.GetAttributeString()).BeginBlock();
 
       // generate local definitions
@@ -297 +296 @@
 
     private void GenerateSwitchStatement(IEnumerable<Sequence> alts, SourceBuilder sb) {
-      sb.Append("switch(_state.PeekNextAlternative()) {").BeginBlock();
+      sb.Append("switch(_t.altIdx) {").BeginBlock();
       // generate a case for each alternative
       int i = 0;
@@ -321 +320 @@
         sb.Append(action.Code + ";");
       else if (!s.Attributes.Any())
-        sb.AppendFormat("_state.Follow({0}); {1}(_state); _state.Unwind();", idx, s.Name);
-      else sb.AppendFormat("_state.Follow({0}); {1}(_state, {2}); _state.Unwind();", idx, s.Name, s.GetAttributeString());
+        sb.AppendFormat("{1}(_t.subtrees[{0}]);", idx, s.Name);
+      else sb.AppendFormat("{1}(_t.subtrees[{0}], {2}); ", idx, s.Name, s.GetAttributeString());
       sb.AppendLine();
     }
@@ -329 +328 @@
       // if the terminal symbol has attributes then we must samples values for these attributes
       if (!s.Attributes.Any())
-        sb.AppendFormat("private void {0}(ISolverState _state) {{", s.Name).BeginBlock();
+        sb.AppendFormat("private void {0}(Tree _t) {{", s.Name).BeginBlock();
       else
-        sb.AppendFormat("private void {0}(ISolverState _state, {1}) {{", s.Name, s.GetAttributeString()).BeginBlock();
+        sb.AppendFormat("private void {0}(Tree _t, {1}) {{", s.Name, s.GetAttributeString()).BeginBlock();
 
       // each field must match a formal parameter, assign a value for each parameter
       int i = 0;
       foreach (var element in s.Attributes) {
-        sb.AppendFormat("_state.Follow({0});", i++).AppendLine();
-        sb.AppendFormat("{0} = Get{1}_{0}(_state);", element.Name, s.Name).AppendLine();
-        sb.AppendFormat("_state.Unwind();").AppendLine();
+        sb.AppendFormat("{0} = (_t as {1}Tree).{0};", element.Name, s.Name).AppendLine();
       }
       sb.Append("}").EndBlock();