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/FloatExpressions.cs

    r14733 r14744  
    1111  [PushExpression(StackType.Float, "FLOAT.+")]
    1212  public class FloatAddExpression : PushResultExpression<double> {
    13     public override void Eval(IPushInterpreter interpreter) {
    14       Eval(interpreter.FloatStack, 2, values => values[0] + values[1]);
     13    public override bool Eval(IPushInterpreter interpreter) {
     14      return Eval(interpreter.FloatStack, 2, values => values[0] + values[1]);
    1515    }
    1616  }
    … …  
    2121  [PushExpression(StackType.Float, "FLOAT.-")]
    2222  public class FloatSubtractExpression : PushResultExpression<double> {
    23     public override void Eval(IPushInterpreter interpreter) {
    24       this.Eval(interpreter.FloatStack, 2, values => values[0] - values[1]);
     23    public override bool Eval(IPushInterpreter interpreter) {
     24      return Eval(interpreter.FloatStack, 2, values => values[0] - values[1]);
    2525    }
    2626  }
    … …  
    3131  [PushExpression(StackType.Float, "FLOAT.*")]
    3232  public class FloatMultiplyExpression : PushResultExpression<double> {
    33     public override void Eval(IPushInterpreter interpreter) {
    34       this.Eval(interpreter.FloatStack, 2, values => values[0] * values[1]);
     33    public override bool Eval(IPushInterpreter interpreter) {
     34      return Eval(interpreter.FloatStack, 2, values => values[0] * values[1]);
    3535    }
    3636  }
    … …  
    4242  [PushExpression(StackType.Float, "FLOAT./")]
    4343  public class FloatDivideExpression : PushResultExpression<double> {
    44     public override void Eval(IPushInterpreter interpreter) {
    45       this.Eval(interpreter.FloatStack, 2, values => values[0] / values[1], 0);
     44    public override bool Eval(IPushInterpreter interpreter) {
     45      return Eval(interpreter.FloatStack, 2, values => values[0] / values[1], 0);
    4646    }
    4747  }
    … …  
    5656  [PushExpression(StackType.Float, "FLOAT.%")]
    5757  public class FloatModuloExpression : PushResultExpression<double> {
    58     public override void Eval(IPushInterpreter interpreter) {
    59       this.Eval(interpreter.FloatStack, 2, values => values[0] % values[1], 0);
     58    public override bool Eval(IPushInterpreter interpreter) {
     59      return Eval(interpreter.FloatStack, 2, values => values[0] % values[1], 0);
    6060    }
    6161  }
    … …  
    6666  [PushExpression(StackType.Float, "FLOAT.MIN")]
    6767  public class FloatMinExpression : PushResultExpression<double> {
    68     public override void Eval(IPushInterpreter interpreter) {
    69       this.Eval(interpreter.FloatStack, 2, values => Math.Min(values[0], values[1]));
     68    public override bool Eval(IPushInterpreter interpreter) {
     69      return Eval(interpreter.FloatStack, 2, values => Math.Min(values[0], values[1]));
    7070    }
    7171  }
    … …  
    7676  [PushExpression(StackType.Float, "FLOAT.MAX")]
    7777  public class FloatMaxExpression : PushResultExpression<double> {
    78     public override void Eval(IPushInterpreter interpreter) {
    79       this.Eval(interpreter.FloatStack, 2, values => Math.Max(values[0], values[1]));
     78    public override bool Eval(IPushInterpreter interpreter) {
     79      return Eval(interpreter.FloatStack, 2, values => Math.Max(values[0], values[1]));
    8080    }
    8181  }
    … …  
    8686  [PushExpression(StackType.Float, "FLOAT.<")]
    8787  public class FloatSmallerThanExpression : PushResultExpression<double> {
    88     public override void Eval(IPushInterpreter interpreter) {
    89       this.Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
     88    public override bool Eval(IPushInterpreter interpreter) {
     89      return Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
    9090    }
    9191  }
    … …  
    9696  [PushExpression(StackType.Float, "FLOAT.>")]
    9797  public class FloatGreaterThanExpression : PushResultExpression<double> {
    98     public override void Eval(IPushInterpreter interpreter) {
    99       this.Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
     98    public override bool Eval(IPushInterpreter interpreter) {
     99      return Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
    100100    }
    101101  }
    … …  
    106106  [PushExpression(StackType.Float, "FLOAT.SIN")]
    107107  public class FloatSineExpression : PushResultExpression<double> {
    108     public override void Eval(IPushInterpreter interpreter) {
    109       this.Eval(interpreter.FloatStack, 1, values => Math.Sin(values[0]));
     108    public override bool Eval(IPushInterpreter interpreter) {
     109      return Eval(interpreter.FloatStack, 1, values => Math.Sin(values[0]));
    110110    }
    111111  }
    … …  
    116116  [PushExpression(StackType.Float, "FLOAT.COS")]
    117117  public class FloatCosineExpression : PushResultExpression<double> {
    118     public override void Eval(IPushInterpreter interpreter) {
    119       this.Eval(interpreter.FloatStack, 1, values => Math.Cos(values[0]));
     118    public override bool Eval(IPushInterpreter interpreter) {
     119      return Eval(interpreter.FloatStack, 1, values => Math.Cos(values[0]));
    120120    }
    121121  }
    … …  
    126126  [PushExpression(StackType.Float, "FLOAT.FROMBOOLEAN")]
    127127  public class FloatFromBooleanExpression : StatelessExpression {
    128     public override void Eval(IPushInterpreter interpreter) {
    129       if (interpreter.BooleanStack.Count == 0) return;
     128    public override bool Eval(IPushInterpreter interpreter) {
     129      if (interpreter.BooleanStack.Count == 0) return false;
    130130
    131131      var condition = interpreter.BooleanStack.Pop();
    … …  
    133133
    134134      interpreter.FloatStack.Push(value);
     135
     136      return true;
    135137    }
    136138  }
    … …  
    141143  [PushExpression(StackType.Float, "FLOAT.FROMINTEGER")]
    142144  public class FloatFromIntegerExpression : StatelessExpression {
    143     public override void Eval(IPushInterpreter interpreter) {
    144       if (interpreter.IntegerStack.Count == 0) return;
     145    public override bool Eval(IPushInterpreter interpreter) {
     146      if (interpreter.IntegerStack.Count == 0) return false;
    145147
    146148      var value = (double)interpreter.IntegerStack.Pop();
    147149
    148150      interpreter.FloatStack.Push(value);
     151
     152      return true;
    149153    }
    150154  }
Note: See TracChangeset for help on using the changeset viewer.