Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/23/17 01:11:18 (7 years ago)
Author:
pkimmesw
Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/IntegerExpressions.cs

    r14744 r14777  
    1010  ///     Pushes the sum of the top two items.
    1111  /// </summary>
    12   [PushExpression(StackType.Integer, "INTEGER.+")]
     12  [PushExpression(StackTypes.Integer, "INTEGER.+")]
    1313  public class IntegerAddExpression : PushResultExpression<long> {
    1414    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    2020  ///     Pushes the difference of the top two items; that is, the second item minus the top item.
    2121  /// </summary>
    22   [PushExpression(StackType.Integer, "INTEGER.-")]
     22  [PushExpression(StackTypes.Integer, "INTEGER.-")]
    2323  public class IntegerSubtractExpression : PushResultExpression<long> {
    2424    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    3030  ///     Pushes the product of the top two items.
    3131  /// </summary>
    32   [PushExpression(StackType.Integer, "INTEGER.*")]
     32  [PushExpression(StackTypes.Integer, "INTEGER.*")]
    3333  public class IntegerMultiplyExpression : PushResultExpression<long> {
    3434    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    4141  ///     If the top item is zero this acts as a NOOP.
    4242  /// </summary>
    43   [PushExpression(StackType.Integer, "INTEGER./")]
     43  [PushExpression(StackTypes.Integer, "INTEGER./")]
    4444  public class IntegerDivideExpression : PushResultExpression<long> {
    4545    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    5656  ///     http://www.lispworks.com/reference/HyperSpec/Body/f_mod_r.htm.)
    5757  /// </summary>
    58   [PushExpression(StackType.Integer, "INTEGER.%")]
     58  [PushExpression(StackTypes.Integer, "INTEGER.%")]
    5959  public class IntegerModuloExpression : PushResultExpression<long> {
    6060    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    6666  ///     Pushes the minimum of the top two items.
    6767  /// </summary>
    68   [PushExpression(StackType.Integer, "INTEGER.MIN")]
     68  [PushExpression(StackTypes.Integer, "INTEGER.MIN")]
    6969  public class IntegerMinExpression : PushResultExpression<long> {
    7070    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    7676  ///     Pushes the maximum of the top two items.
    7777  /// </summary>
    78   [PushExpression(StackType.Integer, "INTEGER.MAX")]
     78  [PushExpression(StackTypes.Integer, "INTEGER.MAX")]
    7979  public class IntegerMaxExpression : PushResultExpression<long> {
    8080    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    8686  ///     Pushes TRUE onto the BOOLEAN stack if the second item is less than the top item, or FALSE otherwise.
    8787  /// </summary>
    88   [PushExpression(StackType.Integer, "INTEGER.<")]
     88  [PushExpression(StackTypes.Integer, "INTEGER.<", StackTypes.Boolean)]
    8989  public class IntegerSmallerThanExpression : PushResultExpression<long> {
    9090    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    9696  ///     Pushes TRUE onto the BOOLEAN stack if the second item is greater than the top item, or FALSE otherwise.
    9797  /// </summary>
    98   [PushExpression(StackType.Integer, "INTEGER.>")]
     98  [PushExpression(StackTypes.Integer, "INTEGER.>", StackTypes.Boolean)]
    9999  public class IntegerGreaterThanExpression : PushResultExpression<long> {
    100100    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    106106  ///     Pushes 1 if the top BOOLEAN is TRUE, or 0 if the top BOOLEAN is FALSE.
    107107  /// </summary>
    108   [PushExpression(StackType.Integer, "INTEGER.FROMBOOLEAN")]
     108  [PushExpression(StackTypes.Integer, "INTEGER.FROMBOOLEAN", StackTypes.Boolean)]
    109109  public class IntegerFromBooleanExpression : StatelessExpression {
    110110    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    123123  ///     Pushes the result of truncating the top FLOAT.
    124124  /// </summary>
    125   [PushExpression(StackType.Integer, "INTEGER.FROMFLOAT")]
     125  [PushExpression(StackTypes.Integer, "INTEGER.FROMFLOAT", StackTypes.Float)]
    126126  public class IntegerFromFloatExpression : StatelessExpression {
    127127    public override bool Eval(IPushInterpreter interpreter) {
Note: See TracChangeset for help on using the changeset viewer.