Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/FloatExpressions.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/FloatExpressions.cs (modified) (11 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System;
+  using System.Globalization;
+
   using Common;
 
@@ -30 +32 @@
       if (double.IsNegativeInfinity(result)) result = double.MinValue;
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -56 +58 @@
       if (double.IsNegativeInfinity(result)) result = double.MinValue;
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -82 +84 @@
       if (double.IsNegativeInfinity(result)) result = double.MinValue;
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -109 +111 @@
       if (double.IsNegativeInfinity(result)) result = double.MinValue;
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -136 +138 @@
       var result = second % first;
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -159 +161 @@
       var result = Math.Min(second, first);
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -182 +184 @@
       var result = Math.Max(second, first);
 
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -298 +300 @@
     public override void Eval(IInternalPushInterpreter interpreter) {
       var result = Math.Sin(interpreter.FloatStack.Top);
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -317 +319 @@
     public override void Eval(IInternalPushInterpreter interpreter) {
       var result = Math.Cos(interpreter.FloatStack.Top);
-      interpreter.FloatStack.SetTop(result);
+      interpreter.FloatStack.Top = result;
     }
   }
@@ -362 +364 @@
     }
   }
+
+  /// <summary>
+  ///     Pushes the result of truncating the top CHAR.
+  /// </summary>
+  [PushExpression(StackTypes.Float, "FLOAT.FROMCHAR", StackTypes.Char)]
+  [StorableClass]
+  public class FloatFromCharExpression : StatelessExpression {
+    public FloatFromCharExpression() { }
+    [StorableConstructor]
+    protected FloatFromCharExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      var value = interpreter.CharStack.Pop();
+      interpreter.FloatStack.Push(value);
+    }
+  }
+
+  /// <summary>
+  ///     Pushes the result of parsing the top STRING.
+  /// </summary>
+  [PushExpression(StackTypes.Float, "FLOAT.FROMSTRING", StackTypes.String)]
+  [StorableClass]
+  public class FloatFromStringExpression : StatelessExpression {
+    public FloatFromStringExpression() { }
+    [StorableConstructor]
+    protected FloatFromStringExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      double tmp;
+      return interpreter.StringStack.IsEmpty ||
+             interpreter.StringStack.Top.Length == 0 ||
+             !double.TryParse(interpreter.StringStack.Top, out tmp);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      var str = interpreter.StringStack.Pop();
+      var value = double.Parse(str, CultureInfo.InvariantCulture);
+
+      interpreter.FloatStack.Push(value);
+    }
+  }
+
+  /// <summary>
+  ///     Pushes the result of increasing the top INTEGER by 1.
+  /// </summary>
+  [PushExpression(StackTypes.Float, "FLOAT.INC")]
+  [StorableClass]
+  public class FloatIncExpression : StatelessExpression {
+    public FloatIncExpression() { }
+    [StorableConstructor]
+    protected FloatIncExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      interpreter.FloatStack.Top += 1;
+    }
+  }
+
+  /// <summary>
+  ///     Pushes the result of decreasing the top INTEGER by 1.
+  /// </summary>
+  [PushExpression(StackTypes.Float, "FLOAT.DEC")]
+  [StorableClass]
+  public class FloatDecExpression : StatelessExpression {
+    public FloatDecExpression() { }
+    [StorableConstructor]
+    protected FloatDecExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      interpreter.FloatStack.Top -= 1;
+    }
+  }
 }