Changeset 9844 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL

Timestamp:

08/03/13 23:10:19 (11 years ago)

Author:

gkronber

Message:

#2026 added two GP benchmark problems even-parity and multiplexer.

Location:

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4

Files:

• GPDef.atg (modified) (2 diffs)
• Parser.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/GPDef.atg

@@ -141 +141 @@
                                                                                     tNode = null;
                                                                                     TerminalNode myTNode = null;
-                                                                                    IEnumerableConstraintNode constraints = null;
+                                                                                    IEnumerableConstraintNode constraints = new List<ConstraintNode>();
                                                                                     string src = "";
                                                                                   .)
@@ -152 +152 @@
                                                                                          myTNode.FieldDefinitions = SourceReader.ExtractFormalParameters(src);
                                                                                   .)
-  [ "CONSTRAINTS" ConstraintDef<out constraints>                                  (. myTNode.Constraints = constraints; .)
-  ]
+  [ "CONSTRAINTS" ConstraintDef<out constraints>
+  ]                                                                               (. myTNode.Constraints = constraints; .)
   '.'
   .

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/Parser.cs

@@ -206 +206 @@
     tNode = null;
     TerminalNode myTNode = null;
-    IEnumerableConstraintNode constraints = null;
+    IEnumerableConstraintNode constraints = new List<ConstraintNode>();
     string src = "";
     
@@ -223 +223 @@
       Get();
       ConstraintDef(out constraints);
-      myTNode.Constraints = constraints; 
-    }
+    }
+    myTNode.Constraints = constraints; 
     Expect(13);
   }