Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/10/17 21:42:09 (7 years ago)
Author:
pkimmesw
Message:

#2665 Renamings due to typos, ManagedPool tests, Skip Noops in Debugger

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r14733 r14744  
    1212  [PushExpression(StackType.Integer, "INTEGER.+")]
    1313  public class IntegerAddExpression : PushResultExpression<long> {
    14     public override void Eval(IPushInterpreter interpreter) {
    15       this.Eval(interpreter.IntegerStack, 2, values => values[0] + values[1]);
     14    public override bool Eval(IPushInterpreter interpreter) {
     15      return Eval(interpreter.IntegerStack, 2, values => values[0] + values[1]);
    1616    }
    1717  }
    … …  
    2222  [PushExpression(StackType.Integer, "INTEGER.-")]
    2323  public class IntegerSubtractExpression : PushResultExpression<long> {
    24     public override void Eval(IPushInterpreter interpreter) {
    25       this.Eval(interpreter.IntegerStack, 2, values => values[0] - values[1]);
     24    public override bool Eval(IPushInterpreter interpreter) {
     25      return Eval(interpreter.IntegerStack, 2, values => values[0] - values[1]);
    2626    }
    2727  }
    … …  
    3232  [PushExpression(StackType.Integer, "INTEGER.*")]
    3333  public class IntegerMultiplyExpression : PushResultExpression<long> {
    34     public override void Eval(IPushInterpreter interpreter) {
    35       this.Eval(interpreter.IntegerStack, 2, values => values[0] * values[1]);
     34    public override bool Eval(IPushInterpreter interpreter) {
     35      return Eval(interpreter.IntegerStack, 2, values => values[0] * values[1]);
    3636    }
    3737  }
    … …  
    4343  [PushExpression(StackType.Integer, "INTEGER./")]
    4444  public class IntegerDivideExpression : PushResultExpression<long> {
    45     public override void Eval(IPushInterpreter interpreter) {
    46       this.Eval(interpreter.IntegerStack, 2, values => values[0] / values[1], 0);
     45    public override bool Eval(IPushInterpreter interpreter) {
     46      return Eval(interpreter.IntegerStack, 2, values => values[0] / values[1], 0);
    4747    }
    4848  }
    … …  
    5858  [PushExpression(StackType.Integer, "INTEGER.%")]
    5959  public class IntegerModuloExpression : PushResultExpression<long> {
    60     public override void Eval(IPushInterpreter interpreter) {
    61       this.Eval(interpreter.IntegerStack, 2, values => values[0] % values[1], 0);
     60    public override bool Eval(IPushInterpreter interpreter) {
     61      return Eval(interpreter.IntegerStack, 2, values => values[0] % values[1], 0);
    6262    }
    6363  }
    … …  
    6868  [PushExpression(StackType.Integer, "INTEGER.MIN")]
    6969  public class IntegerMinExpression : PushResultExpression<long> {
    70     public override void Eval(IPushInterpreter interpreter) {
    71       this.Eval(interpreter.IntegerStack, 2, values => Math.Min(values[0], values[1]));
     70    public override bool Eval(IPushInterpreter interpreter) {
     71      return Eval(interpreter.IntegerStack, 2, values => Math.Min(values[0], values[1]));
    7272    }
    7373  }
    … …  
    7878  [PushExpression(StackType.Integer, "INTEGER.MAX")]
    7979  public class IntegerMaxExpression : PushResultExpression<long> {
    80     public override void Eval(IPushInterpreter interpreter) {
    81       this.Eval(interpreter.IntegerStack, 2, values => Math.Max(values[0], values[1]));
     80    public override bool Eval(IPushInterpreter interpreter) {
     81      return Eval(interpreter.IntegerStack, 2, values => Math.Max(values[0], values[1]));
    8282    }
    8383  }
    … …  
    8888  [PushExpression(StackType.Integer, "INTEGER.<")]
    8989  public class IntegerSmallerThanExpression : PushResultExpression<long> {
    90     public override void Eval(IPushInterpreter interpreter) {
    91       this.Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
     90    public override bool Eval(IPushInterpreter interpreter) {
     91      return Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
    9292    }
    9393  }
    … …  
    9898  [PushExpression(StackType.Integer, "INTEGER.>")]
    9999  public class IntegerGreaterThanExpression : PushResultExpression<long> {
    100     public override void Eval(IPushInterpreter interpreter) {
    101       this.Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
     100    public override bool Eval(IPushInterpreter interpreter) {
     101      return Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
    102102    }
    103103  }
    … …  
    108108  [PushExpression(StackType.Integer, "INTEGER.FROMBOOLEAN")]
    109109  public class IntegerFromBooleanExpression : StatelessExpression {
    110     public override void Eval(IPushInterpreter interpreter) {
    111       if (interpreter.BooleanStack.Count == 0) return;
     110    public override bool Eval(IPushInterpreter interpreter) {
     111      if (interpreter.BooleanStack.Count == 0) return false;
    112112
    113113      var condition = interpreter.BooleanStack.Pop();
    … …  
    115115
    116116      interpreter.IntegerStack.Push(value);
     117
     118      return true;
    117119    }
    118120  }
    … …  
    123125  [PushExpression(StackType.Integer, "INTEGER.FROMFLOAT")]
    124126  public class IntegerFromFloatExpression : StatelessExpression {
    125     public override void Eval(IPushInterpreter interpreter) {
    126       if (interpreter.FloatStack.Count == 0) return;
     127    public override bool Eval(IPushInterpreter interpreter) {
     128      if (interpreter.FloatStack.Count == 0) return false;
    127129
    128130      var value = (int)interpreter.FloatStack.Pop();
    129131
    130132      interpreter.IntegerStack.Push(value);
     133
     134      return true;
    131135    }
    132136  }
Note: See TracChangeset for help on using the changeset viewer.