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

Timestamp:

06/15/18 14:53:46 (6 years ago)

Author:

bburlacu

Message:

#2886: Fix serialization and cloning and plugin properties.

File:

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

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

@@ -37 +37 @@
     private readonly string GrammarSymbolsParameterName = "Grammar Symbols";
 
-    public override bool SupportsPause { get { return false; } }
+    public override bool SupportsPause { get { return true; } }
 
     protected IValueParameter<DoubleValue> VariableImportanceWeightParameter {
@@ -107 +107 @@
     #endregion
 
+    [Storable]
     public Dictionary<int, int> DistinctSentencesComplexity { get; private set; }  // Semantically distinct sentences and their length in a run.
+
+    [Storable]
     public HashSet<int> ArchivedPhrases { get; private set; }
+
+    [Storable]
     internal SearchDataStore OpenPhrases { get; private set; }           // Stack/Queue/etc. for fetching the next node in the search tree.  
 
@@ -121 +126 @@
 
     public Grammar Grammar { get; private set; }
-
 
     #region ctors
@@ -174 +178 @@
         analyzer.Register(this);
       Analyzers.CheckedItemsChanged += Analyzers_CheckedItemsChanged;
+
+      DistinctSentencesComplexity = new Dictionary<int, int>(original.DistinctSentencesComplexity);
+      ArchivedPhrases = new HashSet<int>(original.ArchivedPhrases);
+      OpenPhrases = cloner.Clone(original.OpenPhrases);
+
+      AllGeneratedSentencesCount = original.AllGeneratedSentencesCount;
+      OverwrittenSentencesCount = original.OverwrittenSentencesCount;
+      PhraseExpansionCount = original.PhraseExpansionCount;
+      Grammar = cloner.Clone(original.Grammar);
+
+      if (original.variableImportance != null)
+        variableImportance = new Dictionary<VariableTerminalSymbol, double>(original.variableImportance);
     }
     #endregion
@@ -193 +209 @@
     }
 
-    protected override void Run(CancellationToken cancellationToken) {
-      InitResults();
-      var phrase0 = new SymbolString(new[] { Grammar.StartSymbol });
-      var phrase0Hash = Grammar.Hasher.CalcHashCode(phrase0);
-
-      #region Variable Importance
+    private Dictionary<VariableTerminalSymbol, double> CalculateVariableImportances() {
       variableImportance = new Dictionary<VariableTerminalSymbol, double>();
 
@@ -216 +227 @@
         variableImportance[varSym] = rfImpact.Item2 / sum;
       }
-      #endregion
+      return variableImportance;
+    }
+
+    protected override void Run(CancellationToken cancellationToken) {
+      // do not reinitialize the algorithm if we're resuming from pause
+      if (previousExecutionState != ExecutionState.Paused) {
+        CalculateVariableImportances();
+        InitResults();
+        var phrase0 = new SymbolString(new[] { Grammar.StartSymbol });
+        var phrase0Hash = Grammar.Hasher.CalcHashCode(phrase0);
+        OpenPhrases.Store(new SearchNode(phrase0Hash, 0.0, 0.0, phrase0));
+      }
 
       int maxSentenceLength = GetMaxSentenceLength();
-
-      OpenPhrases.Store(new SearchNode(phrase0Hash, 0.0, 0.0, phrase0));
-
       var errorWeight = ErrorWeight;
       var variableImportanceWeight = VariableImportanceWeight;
-
+      // main search loop
       while (OpenPhrases.Count > 0) {
-        if (cancellationToken.IsCancellationRequested) break;
+        if (cancellationToken.IsCancellationRequested)
+          break;
 
         SearchNode fetchedSearchNode = OpenPhrases.GetNext();
@@ -343 +363 @@
       return p.Count(s => s is NonterminalSymbol);
     }
+
+    #region pause support
+    private ExecutionState previousExecutionState;
+    protected override void OnPaused() {
+      previousExecutionState = this.ExecutionState;
+      base.OnPaused();
+    }
+    protected override void OnPrepared() {
+      previousExecutionState = this.ExecutionState;
+      base.OnPrepared();
+    }
+    protected override void OnStarted() {
+      previousExecutionState = this.ExecutionState;
+      base.OnStarted();
+    }
+    protected override void OnStopped() {
+      previousExecutionState = this.ExecutionState;
+      base.OnStopped();
+    }
+    #endregion
 
     #region Visualization in HL