Changeset 10086 for branches/HeuristicLab.Problems.GPDL/CodeGenerator/BruteForceCodeGen.cs

Timestamp:

10/27/13 20:17:17 (10 years ago)

Author:

gkronber

Message:

#2026 worked on random search solver (now all examples are working)

File:

• branches/HeuristicLab.Problems.GPDL/CodeGenerator/BruteForceCodeGen.cs (modified) (6 diffs)

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

@@ -81 +81 @@
             nextAlternative = (nextAlternative + 1) % subTrees.Length;
           } while (subTrees[nextAlternative] != null && subTrees[nextAlternative].Done);
-
-          // from the nodes which are not done take the first with minimum count
-          //nextAlternative = (from i in Enumerable.Range(0, subTrees.Length)
-          //                   where subTrees[i] == null || !subTrees[i].Done
-          //                   orderby subTrees[i]==null?0:subTrees[i].Count ascending
-          //                   select i).FirstOrDefault(); // possibly there are no children left that can be tried
         } else {
           // for sequenceNodes update all sub-trees
@@ -177 +171 @@
 
     private AttributedGrammar CreateGrammarFromAst(GPDefNode ast) {
+
+      var nonTerminals = ast.NonTerminals.Select(t => new Symbol(t.Ident, GetSymbolAttributes(t.FormalParameters))).ToArray();
+      var terminals = ast.Terminals.Select(t => new Symbol(t.Ident, GetSymbolAttributes(t.FormalParameters))).ToArray();
       string startSymbolName = ast.Rules.First().NtSymbol;
-      var startSymbolNode = ast.NonTerminals.Single(nt => nt.Ident == startSymbolName);
+
       // create startSymbol
-      var g = new AttributedGrammar(new Symbol(startSymbolName, ParseSymbolAttributes(startSymbolNode.FormalParameters)));
+      var startSymbol = nonTerminals.Single(s => s.Name == startSymbolName);
+      var g = new AttributedGrammar(startSymbol, nonTerminals, terminals);
+
+      // add all production rules
       foreach (var rule in ast.Rules) {
-        // create nt-symbol
-        var ntSymbolName = rule.NtSymbol;
-        var ntSymbolNode = ast.NonTerminals.Single(nt => nt.Ident == ntSymbolName);
-        var attributes = ParseSymbolAttributes(ntSymbolNode.FormalParameters);
-        var ntSymbol = new Symbol(ntSymbolName, attributes);
-        foreach (var alt in GetAlternatives(rule.Alternatives)) {
+        var ntSymbol = nonTerminals.Single(s => s.Name == rule.NtSymbol);
+        foreach (var alt in GetAlternatives(rule.Alternatives, nonTerminals.Concat(terminals))) {
           g.AddProductionRule(ntSymbol, alt);
         }
@@ -196 +192 @@
     }
 
-    private IEnumerable<IAttribute> ParseSymbolAttributes(string formalParameters) {
+    private IEnumerable<IAttribute> GetSymbolAttributes(string formalParameters) {
       return (from fieldDef in Util.ExtractParameters(formalParameters)
               select new Attribute(fieldDef.Identifier, fieldDef.Type, AttributeType.Parse(fieldDef.RefOrOut))).
@@ -202 +198 @@
     }
 
-    private IEnumerable<Sequence> GetAlternatives(AlternativesNode altNode) {
+    private IEnumerable<Sequence> GetAlternatives(AlternativesNode altNode, IEnumerable<ISymbol> allSymbols) {
       foreach (var alt in altNode.Alternatives) {
-        yield return GetSequence(alt.Sequence);
-      }
-    }
-
-    private Sequence GetSequence(IEnumerable<RuleExprNode> sequence) {
+        yield return GetSequence(alt.Sequence, allSymbols);
+      }
+    }
+
+    private Sequence GetSequence(IEnumerable<RuleExprNode> sequence, IEnumerable<ISymbol> allSymbols) {
       Debug.Assert(sequence.All(s => s is CallSymbolNode || s is RuleActionNode));
       var l = new List<ISymbol>();
@@ -215 +211 @@
         var actionNode = node as RuleActionNode;
         if (callSymbolNode != null) {
-          l.Add(new Symbol(callSymbolNode.Ident, ParseSymbolAttributes(callSymbolNode.ActualParameter)));
+          Debug.Assert(allSymbols.Any(s => s.Name == callSymbolNode.Ident));
+          // create a new symbol with actual parameters
+          l.Add(new Symbol(callSymbolNode.Ident, GetSymbolAttributes(callSymbolNode.ActualParameter)));
         } else if (actionNode != null) {
           l.Add(new SemanticSymbol("SEM", actionNode.SrcCode));
@@ -313 +311 @@
 
       // make sure we first descent into terminal alternatives -> we just order by number of non-terminals in the alternative
-      var altsWithSemActions = g.GetAlternativesWithSemanticActions(s).OrderBy(alt => alt.Count(symb => g.IsNonTerminal(symb))).ToArray();
+      var altsWithSemActions = g.GetAlternativesWithSemanticActions(s)
+        .OrderBy(alt => alt.Count(symb => g.IsNonTerminal(symb))).ToArray();
 
       if (altsWithSemActions.Length > 1) {