Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CharExpressions.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/CharExpressions.cs (modified) (1 diff)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System;
-
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
+  using Attributes;
+  using Interpreter;
+  using Persistence.Default.CompositeSerializers.Storable;
+  using Stack;
 
   [PushExpression(StackTypes.Char, "CHAR.ISWHITESPACE", StackTypes.Boolean)]
+  [StorableClass]
   public class CharIsWhitespaceExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.CharStack.IsEmpty) return false;
+    public CharIsWhitespaceExpression() { }
+    [StorableConstructor]
+    public CharIsWhitespaceExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var c = interpreter.CharStack.Pop();
       interpreter.BooleanStack.Push(char.IsWhiteSpace(c));
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.ISLETTER", StackTypes.Boolean)]
+  [StorableClass]
   public class CharIsLetterExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.CharStack.IsEmpty) return false;
+    public CharIsLetterExpression() { }
+    [StorableConstructor]
+    public CharIsLetterExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var c = interpreter.CharStack.Pop();
       interpreter.BooleanStack.Push(char.IsLetter(c));
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.ISDIGIT", StackTypes.Boolean)]
+  [StorableClass]
   public class CharIsDigitExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.CharStack.IsEmpty) return false;
+    public CharIsDigitExpression() { }
+    [StorableConstructor]
+    public CharIsDigitExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var c = interpreter.CharStack.Pop();
       interpreter.BooleanStack.Push(char.IsDigit(c));
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.FROMINTEGER", StackTypes.Integer)]
+  [StorableClass]
   public class CharFromIntegerExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.IntegerStack.IsEmpty) return false;
+    public CharFromIntegerExpression() { }
+    [StorableConstructor]
+    public CharFromIntegerExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var value = (int)Math.Abs(interpreter.IntegerStack.Pop() % 128);
       var c = Convert.ToChar(value);
 
       interpreter.CharStack.Push(c);
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.FROMFLOAT", StackTypes.Float)]
+  [StorableClass]
   public class CharFromFloatExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.FloatStack.IsEmpty) return false;
+    public CharFromFloatExpression() { }
+    [StorableConstructor]
+    public CharFromFloatExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var value = (int)Math.Abs(interpreter.FloatStack.Pop() % 128);
       var c = Convert.ToChar(value);
 
       interpreter.CharStack.Push(c);
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.ALLFROMSTRING", StackTypes.String)]
+  [StorableClass]
   public class CharAllFromStringExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.StringStack.IsEmpty) return false;
+    public CharAllFromStringExpression() { }
+    [StorableConstructor]
+    public CharAllFromStringExpression(bool deserializing) : base(deserializing) { }
 
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.StringStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
       var chars = interpreter.StringStack.Pop().ToCharArray();
       interpreter.CharStack.Push(chars);
-      return true;
     }
   }