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

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

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

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

@@ -9 +9 @@
     [Storable]
     public T State { get; protected set; }
+    [NonSerialized]
     private int? hashCode;
+    [NonSerialized]
     private string stringRepresentation;
 
@@ -20 +22 @@
 
     protected virtual int CalcHashCode() {
-      return State.GetHashCode();
+      var hash = 19 * 31 + GetType().FullName.GetHashCode();
+      hash = hash * 31 + State.GetHashCode();
+
+      return hash;
+    }
+
+    protected virtual string GetStringRepresentation() {
+      return State.ToString();
     }
 
@@ -27 +36 @@
       get
       {
-        return stringRepresentation ?? (stringRepresentation = State.ToString());
+        return stringRepresentation ?? (stringRepresentation = GetStringRepresentation());
       }
     }