Ignore:
Timestamp:
04/10/17 00:27:31 (3 years ago)
Author:
pkimmesw
Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

File:
1 edited

Legend:

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

    r14777 r14834  
    1212  [PushExpression(StackTypes.Integer, "INTEGER.+")]
    1313  public class IntegerAddExpression : PushResultExpression<long> {
    14     public override bool Eval(IPushInterpreter interpreter) {
     14    public override bool Eval(IInternalPushInterpreter interpreter) {
    1515      return Eval(interpreter.IntegerStack, 2, values => values[0] + values[1]);
    1616    }
     
    2222  [PushExpression(StackTypes.Integer, "INTEGER.-")]
    2323  public class IntegerSubtractExpression : PushResultExpression<long> {
    24     public override bool Eval(IPushInterpreter interpreter) {
     24    public override bool Eval(IInternalPushInterpreter interpreter) {
    2525      return Eval(interpreter.IntegerStack, 2, values => values[0] - values[1]);
    2626    }
     
    3232  [PushExpression(StackTypes.Integer, "INTEGER.*")]
    3333  public class IntegerMultiplyExpression : PushResultExpression<long> {
    34     public override bool Eval(IPushInterpreter interpreter) {
     34    public override bool Eval(IInternalPushInterpreter interpreter) {
    3535      return Eval(interpreter.IntegerStack, 2, values => values[0] * values[1]);
    3636    }
     
    4343  [PushExpression(StackTypes.Integer, "INTEGER./")]
    4444  public class IntegerDivideExpression : PushResultExpression<long> {
    45     public override bool Eval(IPushInterpreter interpreter) {
     45    public override bool Eval(IInternalPushInterpreter interpreter) {
    4646      return Eval(interpreter.IntegerStack, 2, values => values[0] / values[1], 0);
    4747    }
     
    5858  [PushExpression(StackTypes.Integer, "INTEGER.%")]
    5959  public class IntegerModuloExpression : PushResultExpression<long> {
    60     public override bool Eval(IPushInterpreter interpreter) {
     60    public override bool Eval(IInternalPushInterpreter interpreter) {
    6161      return Eval(interpreter.IntegerStack, 2, values => values[0] % values[1], 0);
    6262    }
     
    6868  [PushExpression(StackTypes.Integer, "INTEGER.MIN")]
    6969  public class IntegerMinExpression : PushResultExpression<long> {
    70     public override bool Eval(IPushInterpreter interpreter) {
     70    public override bool Eval(IInternalPushInterpreter interpreter) {
    7171      return Eval(interpreter.IntegerStack, 2, values => Math.Min(values[0], values[1]));
    7272    }
     
    7878  [PushExpression(StackTypes.Integer, "INTEGER.MAX")]
    7979  public class IntegerMaxExpression : PushResultExpression<long> {
    80     public override bool Eval(IPushInterpreter interpreter) {
     80    public override bool Eval(IInternalPushInterpreter interpreter) {
    8181      return Eval(interpreter.IntegerStack, 2, values => Math.Max(values[0], values[1]));
    8282    }
     
    8888  [PushExpression(StackTypes.Integer, "INTEGER.<", StackTypes.Boolean)]
    8989  public class IntegerSmallerThanExpression : PushResultExpression<long> {
    90     public override bool Eval(IPushInterpreter interpreter) {
     90    public override bool Eval(IInternalPushInterpreter interpreter) {
    9191      return Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
    9292    }
     
    9898  [PushExpression(StackTypes.Integer, "INTEGER.>", StackTypes.Boolean)]
    9999  public class IntegerGreaterThanExpression : PushResultExpression<long> {
    100     public override bool Eval(IPushInterpreter interpreter) {
     100    public override bool Eval(IInternalPushInterpreter interpreter) {
    101101      return Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
    102102    }
     
    108108  [PushExpression(StackTypes.Integer, "INTEGER.FROMBOOLEAN", StackTypes.Boolean)]
    109109  public class IntegerFromBooleanExpression : StatelessExpression {
    110     public override bool Eval(IPushInterpreter interpreter) {
     110    public override bool Eval(IInternalPushInterpreter interpreter) {
    111111      if (interpreter.BooleanStack.Count == 0) return false;
    112112
     
    125125  [PushExpression(StackTypes.Integer, "INTEGER.FROMFLOAT", StackTypes.Float)]
    126126  public class IntegerFromFloatExpression : StatelessExpression {
    127     public override bool Eval(IPushInterpreter interpreter) {
     127    public override bool Eval(IInternalPushInterpreter interpreter) {
    128128      if (interpreter.FloatStack.Count == 0) return false;
    129129
Note: See TracChangeset for help on using the changeset viewer.