Changeset 15930 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs

Timestamp:

05/08/18 16:40:07 (6 years ago)

Author:

lkammere

Message:

#2886: Make grammar more configurable in grammar enumeration.

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs (modified) (5 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs

@@ -35 +35 @@
     private readonly string MaxComplexityParameterName = "Max. Complexity";
     private readonly string GuiUpdateIntervalParameterName = "GUI Update Interval";
+    private readonly string GrammarSymbolsParameterName = "Grammar Symbols";
 
     public override bool SupportsPause { get { return false; } }
@@ -85 +86 @@
     public ICheckedItemCollection<IGrammarEnumerationAnalyzer> Analyzers {
       get { return AnalyzersParameter.Value; }
+    }
+
+    public IFixedValueParameter<ReadOnlyCheckedItemCollection<EnumValue<GrammarRule>>> GrammarSymbolsParameter {
+      get { return (IFixedValueParameter<ReadOnlyCheckedItemCollection<EnumValue<GrammarRule>>>)Parameters[GrammarSymbolsParameterName]; }
+    }
+
+    public ReadOnlyCheckedItemCollection<EnumValue<GrammarRule>> GrammarSymbols {
+      get { return GrammarSymbolsParameter.Value; }
     }
 
@@ -136 +145 @@
       Analyzers.SetItemCheckedState(Analyzers.First(analyzer => analyzer is RSquaredEvaluator), true);
       //Analyzers.SetItemCheckedState(Analyzers.First(analyzer => analyzer is SentenceLogger), true);
+
+      var grammarSymbols = Enum.GetValues(typeof(GrammarRule))
+        .Cast<GrammarRule>()
+        .Select(v => new EnumValue<GrammarRule>(v));
+
+      Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemCollection<EnumValue<GrammarRule>>>(
+        GrammarSymbolsParameterName,
+        new ReadOnlyCheckedItemCollection<EnumValue<GrammarRule>>(new CheckedItemCollection<EnumValue<GrammarRule>>(grammarSymbols))
+      ));
+      foreach (EnumValue<GrammarRule> grammarSymbol in GrammarSymbols) {
+        GrammarSymbols.SetItemCheckedState(grammarSymbol, true);
+      }
     }
 
     public GrammarEnumerationAlgorithm(GrammarEnumerationAlgorithm original, Cloner cloner) : base(original, cloner) {
-
-
     }
     #endregion
@@ -165 +184 @@
       PhraseExpansionCount = 0;
 
-      Grammar = new Grammar(Problem.ProblemData.AllowedInputVariables.ToArray());
+      Grammar = new Grammar(Problem.ProblemData.AllowedInputVariables.ToArray(), GrammarSymbols.CheckedItems.Select(v => v.Value));
 
       OpenPhrases = new SearchDataStore(SearchDataStructure); // Select search strategy
@@ -261 +280 @@
       SymbolString s = new SymbolString(Grammar.StartSymbol);
 
-      while (Grammar.GetComplexity(s) <= MaxComplexity) {
+      while (!s.IsSentence() && Grammar.GetComplexity(s) <= MaxComplexity) {
         int expandedSymbolIndex = s.NextNonterminalIndex();
         NonterminalSymbol expandedSymbol = (NonterminalSymbol)s[expandedSymbolIndex];