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

Timestamp:

05/10/17 11:23:05 (8 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System;
-
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
 
   [Serializable]
+  [StorableClass]
   public abstract class StatefulExpression<T> : Expression, IPooledObject {
+    [Storable]
     public T State { get; protected set; }
     private int? hashCode;
@@ -13 +15 @@
       State = state;
     }
+
+    [StorableConstructor]
+    protected StatefulExpression(bool deserializing) : base(deserializing) { }
 
     protected virtual int CalcHashCode() {
@@ -22 +27 @@
       get
       {
-        if (stringRepresentation == null) stringRepresentation = State.ToString();
-        return stringRepresentation;
+        return stringRepresentation ?? (stringRepresentation = State.ToString());
       }
     }