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

Timestamp:

05/10/17 11:23:05 (7 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/Expression.cs (modified) (4 diffs)

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

@@ -2 +2 @@
   using System;
   using System.Collections.Generic;
+
+  using HeuristicLab.Common;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
 
@@ -7 +10 @@
 
   [Serializable]
-  public abstract class Expression : IPooledObject {
+  [StorableClass]
+  public abstract class Expression : IDeepCloneable, IPooledObject {
+
+    protected Expression() { }
+
+    [StorableConstructor]
+    protected Expression(bool deserializing) { }
+
     public bool IsProgram { get { return GetType() == typeof(PushProgram); } }
 
@@ -20 +30 @@
     }
 
-    //public abstract bool IsNoop(IInternalPushInterpreter interpreter);
+    public abstract bool IsNoop(IInternalPushInterpreter interpreter);
+    public abstract void Eval(IInternalPushInterpreter interpreter);
 
-    public abstract bool Eval(IInternalPushInterpreter interpreter);
+    public bool TryEval(IInternalPushInterpreter interpreter) {
+      if (IsNoop(interpreter))
+        return false;
+
+      Eval(interpreter);
+      return true;
+    }
 
     public override string ToString() {
@@ -28 +45 @@
     }
 
+    public object Clone() {
+      return this;
+    }
+
+    public IDeepCloneable Clone(Cloner cloner) {
+      return this;
+    }
+
     void IPooledObject.Reset() { }
   }