Changeset 16176 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Symbol.cs

Timestamp:

09/22/18 21:57:59 (6 years ago)

Author:

bburlacu

Message:

#2886: Fix hashing

File:

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

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

@@ -26 +26 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration {
   [StorableClass]
-  public abstract class Symbol : DeepCloneable, IEquatable<Symbol> {
+  public abstract class Symbol : DeepCloneable, IEquatable<Symbol>, IComparable<Symbol> {
     [Storable]
     private readonly int stringRepresentationHash;
@@ -78 +78 @@
       return stringRepresentationHash;
     }
+
+    public int CompareTo(Symbol other) {
+      var v1 = this as VariableTerminalSymbol;
+      var v2 = other as VariableTerminalSymbol;
+
+      if ((v1 == null && v2 == null) || (v1 != null && v2 != null))
+        return this.StringRepresentation.CompareTo(other.StringRepresentation);
+      return v1 == null ? 1 : -1;
+    }
     #endregion
   }
@@ -119 +128 @@
     protected NonterminalSymbol(bool deserializing) : base(deserializing) { }
   }
-
-
 }