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

Timestamp:

06/28/18 16:56:41 (6 years ago)

Author:

bburlacu

Message:

#2886: address additional serialization issues, make Production implement IList<T> instead of deriving from List<T>

File:

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

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

@@ -52 +52 @@
     }
 
-    protected double VariableImportanceWeight {
+    public double VariableImportanceWeight {
       get { return VariableImportanceWeightParameter.Value.Value; }
+      set { VariableImportanceWeightParameter.Value.Value = value; }
     }
 
@@ -133 +134 @@
     }
 
+    [Storable]
     public SymbolString BestTrainingSentence { get; set; }     // Currently set in RSquaredEvaluator: quite hacky, but makes testing much easier for now...
     #endregion
@@ -144 +146 @@
     [Storable]
     internal SearchDataStore OpenPhrases { get; private set; }           // Stack/Queue/etc. for fetching the next node in the search tree.  
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      variableImportance = CalculateVariableImportances();
-    }
 
     #region execution stats
@@ -162 +159 @@
     #endregion
 
+    [Storable]
     public Grammar Grammar { get; private set; }
 
@@ -168 +166 @@
       return new GrammarEnumerationAlgorithm(this, cloner);
     }
+
+    [StorableConstructor]
+    protected GrammarEnumerationAlgorithm(bool deserializing) : base(deserializing) { }
 
     public GrammarEnumerationAlgorithm() {
@@ -237 +238 @@
     #endregion
 
+    [Storable]
     private Dictionary<VariableTerminalSymbol, double> variableImportance;
 
@@ -250 +252 @@
       OpenPhrases = new SearchDataStore(SearchDataStructure, SearchDataStructureSize, SearchCacheSize); // Select search strategy
 
+      CalculateVariableImportances();
+
       base.Prepare(); // this actually clears the results which will get reinitialized on Run()
     }
 
-    private Dictionary<VariableTerminalSymbol, double> CalculateVariableImportances() {
+    private void CalculateVariableImportances() {
       variableImportance = new Dictionary<VariableTerminalSymbol, double>();
 
@@ -271 +275 @@
         variableImportance[varSym] = rfImpact.Item2 / sum;
       }
-      return variableImportance;
     }
 
@@ -277 +280 @@
       // do not reinitialize the algorithm if we're resuming from pause
       if (previousExecutionState != ExecutionState.Paused) {
-        CalculateVariableImportances();
         InitResults();
         var phrase0 = new SymbolString(new[] { Grammar.StartSymbol });