Changeset 15960 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Hashing

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/Hashing/Hasher.cs (modified) (4 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Hashing/Hasher.cs

@@ -3 +3 @@
 using System.Diagnostics;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration.GrammarEnumeration {
-  public abstract class Hasher<THashType> {
+  [StorableClass]
+  public abstract class Hasher<THashType> : DeepCloneable {
     protected Hasher(Grammar grammar) {
       Grammar = grammar;
+    }
+
+    protected Hasher(Hasher<THashType> original, Cloner cloner) : base(original, cloner) {
+      Grammar = cloner.Clone(original.Grammar);
     }
 
@@ -22 +29 @@
       return AggregateHashes(peek, GetSubtreeHashes(parseStack)).GetHashCode();
     }
+
+    [StorableConstructor]
+    protected Hasher(bool deserializing) { }
 
     private THashType[] GetSubtreeHashes(Stack<Symbol> parseStack) {
@@ -109 +119 @@
         .ToArray();
     }
-
-
   }
 
+  [StorableClass]
   public class IntHasher : Hasher<int> {
     public IntHasher(Grammar grammar) : base(grammar) { }
+
+    public IntHasher(IntHasher original, Cloner cloner) : base(original, cloner) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new IntHasher(this, cloner);
+    }
+
+    [StorableConstructor]
+    protected IntHasher(bool deserializing) : base(deserializing) { }
 
     protected override int AggregateHashes(Symbol operatorSym, int[] hashes) {
@@ -135 +153 @@
   }
 
+  [StorableClass]
   public class StringHasher : Hasher<string> {
     public StringHasher(Grammar grammar) : base(grammar) { }
+
+    public StringHasher(StringHasher original, Cloner cloner) : base(original, cloner) { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StringHasher(this, cloner);
+    }
+
+    [StorableConstructor]
+    protected StringHasher(bool deserializing) : base(deserializing) { }
 
     protected override string AggregateHashes(Symbol operatorSym, string[] hashes) {