Changeset 15949

Timestamp:

06/05/18 14:33:12 (6 years ago)

Author:

bburlacu

Message:

#2886: Fix serialization (saving the algorithm).

Location:

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis

Files:

• RSquaredEvaluator.cs (modified) (3 diffs)
• SearchGraphVisualizer.cs (modified) (2 diffs)
• SentenceLogger.cs (modified) (1 diff)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/RSquaredEvaluator.cs

@@ -6 +6 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
@@ -12 +12 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration {
+  [Item("RSquaredEvaluator", "")]
+  [StorableClass]
   public class RSquaredEvaluator : Item, IGrammarEnumerationAnalyzer {
     public static readonly string BestTrainingQualityResultName = "Best R² (Training)";
@@ -34 +36 @@
       algorithm.Started += OnStarted;
       algorithm.Stopped += OnStopped;
-
       algorithm.DistinctSentenceGenerated += AlgorithmOnDistinctSentenceGenerated;
     }

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/SearchGraphVisualizer.cs

@@ -5 +5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration {
-  class SearchGraphVisualizer : Item, IGrammarEnumerationAnalyzer {
+  [Item("SearchGraphVisualizer", "")]
+  [StorableClass]
+  internal class SearchGraphVisualizer : Item, IGrammarEnumerationAnalyzer {
     private readonly string dotFileName = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + @"\searchgraph.dot";
 
@@ -15 +18 @@
 
     protected SearchGraphVisualizer(SearchGraphVisualizer original, Cloner cloner) : base(original, cloner) { }
+
+    [StorableConstructor]
+    protected SearchGraphVisualizer(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/SentenceLogger.cs

@@ -5 +5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration {
+  [Item("SentenceLogger", "")]
+  [StorableClass]
   public class SentenceLogger : Item, IGrammarEnumerationAnalyzer {
     private readonly string workingDir = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);