Changeset 14746 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StatefulExpression.cs

Timestamp:

03/11/17 20:07:13 (8 years ago)

Author:

pkimmesw

Message:

#2665 PooledPushProgram reduces memory usage and increases performance

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StatefulExpression.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StatefulExpression.cs

@@ -2 +2 @@
   public abstract class StatefulExpression<T> : Expression {
     public readonly T State;
-
-    private int hashCode;
-    private int HashCode
-    {
-      get
-      {
-        if (hashCode == default(int)) hashCode = CalcHashCode();
-        return hashCode;
-      }
-    }
+    private int? hashCode;
 
     protected StatefulExpression(T state) {
@@ -34 +25 @@
     }
 
+    public bool Equals(StatefulExpression<T> obj) {
+      if (ReferenceEquals(this, obj))
+        return true;
+
+      if (GetType() != obj.GetType())
+        return false;
+
+      return ReferenceEquals(State, obj.State) ||
+             GetHashCode() == obj.GetHashCode();
+    }
+
     public override int GetHashCode() {
-      return HashCode;
+      if (hashCode == null) hashCode = CalcHashCode();
+      return hashCode.Value;
     }
   }