Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/08/17 11:57:42 (8 years ago)
Author:
pkimmesw
Message:

#2665 Storable problem data, Renamings due to typos, Removed GP from class names

Location:
branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions
Files:
26 edited

Legend:

Unmodified
Added
Removed

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

    r14727 r14733  
    99  [PushExpression(StackType.Boolean, "BOOLEAN.AND")]
    1010  public class BooleanAndExpression : PushResultExpression<bool> {
    11     public override void Eval(IPushGpInterpreter interpreter) {
     11    public override void Eval(IPushInterpreter interpreter) {
    1212      this.Eval(interpreter.BooleanStack, 2, values => values[0] && values[1]);
    1313    }
    … …  
    1919  [PushExpression(StackType.Boolean, "BOOLEAN.OR")]
    2020  public class BooleanOrExpression : PushResultExpression<bool> {
    21     public override void Eval(IPushGpInterpreter interpreter) {
     21    public override void Eval(IPushInterpreter interpreter) {
    2222      this.Eval(interpreter.BooleanStack, 2, values => values[0] || values[1]);
    2323    }
    … …  
    2929  [PushExpression(StackType.Boolean, "BOOLEAN.NOT")]
    3030  public class BooleanNotExpression : PushResultExpression<bool> {
    31     public override void Eval(IPushGpInterpreter interpreter) {
     31    public override void Eval(IPushInterpreter interpreter) {
    3232      this.Eval(interpreter.BooleanStack, 1, values => !values[0]);
    3333    }
    … …  
    3939  [PushExpression(StackType.Boolean, "BOOLEAN.FROMFLOAT")]
    4040  public class BooleanFromFloatExpression : StatelessExpression {
    41     public override void Eval(IPushGpInterpreter interpreter) {
     41    public override void Eval(IPushInterpreter interpreter) {
    4242      if (interpreter.FloatStack.Count == 0) return;
    4343
    … …  
    5353  [PushExpression(StackType.Boolean, "BOOLEAN.FROMINTEGER")]
    5454  public class BooleanFromIntegerExpression : StatelessExpression {
    55     public override void Eval(IPushGpInterpreter interpreter) {
     55    public override void Eval(IPushInterpreter interpreter) {
    5656      if (interpreter.IntegerStack.Count == 0) return;
    5757

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

    r14727 r14733  
    2222  [PushExpression(StackType.Code, "CODE.DO")]
    2323  public class CodeDoExpression : StatelessExpression {
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      // not enough arguments on stack
    2626      if (interpreter.CodeStack.Count == 0) return;
    … …  
    3636  [PushExpression(StackType.Code, "CODE.DO*")]
    3737  public class CodeDoXExpression : StatelessExpression {
    38     public override void Eval(IPushGpInterpreter interpreter) {
     38    public override void Eval(IPushInterpreter interpreter) {
    3939      // not enough arguments on stack
    4040      if (interpreter.CodeStack.Count == 0) return;
    … …  
    5050  [PushExpression(StackType.Code, "CODE.NOOP")]
    5151  public class CodeNoopExpression : StatelessExpression {
    52     public override void Eval(IPushGpInterpreter interpreter) {
     52    public override void Eval(IPushInterpreter interpreter) {
    5353      // nothing to do
    5454    }
    … …  
    6161  [PushExpression(StackType.Code, "CODE.QUOTE")]
    6262  public class CodeQuoteExpression : StatelessExpression {
    63     public override void Eval(IPushGpInterpreter interpreter) {
     63    public override void Eval(IPushInterpreter interpreter) {
    6464      // not enough arguments on stack
    6565      if (interpreter.ExecStack.Count == 0) return;
    … …  
    7777  [PushExpression(StackType.Code, "CODE.IF")]
    7878  public class CodeIfExpression : StatelessExpression {
    79     public override void Eval(IPushGpInterpreter interpreter) {
     79    public override void Eval(IPushInterpreter interpreter) {
    8080      // not enough arguments on stack
    8181      if ((interpreter.BooleanStack.Count == 0) || (interpreter.CodeStack.Count < 2)) return;
    … …  
    9494  [PushExpression(StackType.Code, "CODE.APPEND")]
    9595  public class CodeAppendExpression : StatelessExpression {
    96     public override void Eval(IPushGpInterpreter interpreter) {
     96    public override void Eval(IPushInterpreter interpreter) {
    9797      if (interpreter.CodeStack.Count < 2) return;
    9898
    … …  
    163163  [PushExpression(StackType.Code, "CODE.ATOM")]
    164164  public class CodeAtomExpression : StatelessExpression {
    165     public override void Eval(IPushGpInterpreter interpreter) {
     165    public override void Eval(IPushInterpreter interpreter) {
    166166      if (interpreter.CodeStack.Count == 0) return;
    167167
    … …  
    181181  [PushExpression(StackType.Code, "CODE.CAR")]
    182182  public class CodeCarExpression : StatelessExpression {
    183     public override void Eval(IPushGpInterpreter interpreter) {
     183    public override void Eval(IPushInterpreter interpreter) {
    184184      if ((interpreter.CodeStack.Count == 0) || (interpreter.CodeStack.Top.GetType() !=
    185185                                                 typeof(ExecExpandExpression))) return;
    … …  
    202202  [PushExpression(StackType.Code, "CODE.CDR")]
    203203  public class CodeCdrExpression : StatelessExpression {
    204     public override void Eval(IPushGpInterpreter interpreter) {
     204    public override void Eval(IPushInterpreter interpreter) {
    205205      if (interpreter.CodeStack.Count == 0) return;
    206206
    … …  
    233233  [PushExpression(StackType.Code, "CODE.CONS")]
    234234  public class CodeConsExpression : StatelessExpression {
    235     public override void Eval(IPushGpInterpreter interpreter) {
     235    public override void Eval(IPushInterpreter interpreter) {
    236236      if (interpreter.CodeStack.Count < 2)
    237237        return;
    … …  
    269269  [PushExpression(StackType.Code, "CODE.CONTAINER")]
    270270  public class CodeContainerExpression : StatelessExpression {
    271     public override void Eval(IPushGpInterpreter interpreter) {
     271    public override void Eval(IPushInterpreter interpreter) {
    272272      if ((interpreter.CodeStack.Count < 2) ||
    273273          (interpreter.CodeStack[interpreter.CodeStack.Count - 2].GetType() !=
    … …  
    307307  [PushExpression(StackType.Code, "CODE.CONTAINS")]
    308308  public class CodeContainsExpression : StatelessExpression {
    309     public override void Eval(IPushGpInterpreter interpreter) {
     309    public override void Eval(IPushInterpreter interpreter) {
    310310      if (interpreter.CodeStack.Count < 2 ||
    311311         !interpreter.CodeStack[interpreter.CodeStack.Count - 2].CanExpand)
    … …  
    327327  [PushExpression(StackType.Code, "CODE.DEFINITION")]
    328328  public class CodeDefinitionExpression : StatelessExpression {
    329     public override void Eval(IPushGpInterpreter interpreter) {
     329    public override void Eval(IPushInterpreter interpreter) {
    330330      if ((interpreter.NameStack.Count == 0) ||
    331331          !interpreter.CustomExpressions.ContainsKey(interpreter.NameStack.Top)) return;
    … …  
    363363  [PushExpression(StackType.Code, "CODE.DISCREPANCY")]
    364364  public class CodeDiscrepancyExpression : StatelessExpression {
    365     public override void Eval(IPushGpInterpreter interpreter) {
     365    public override void Eval(IPushInterpreter interpreter) {
    366366      if (interpreter.CodeStack.Count < 2) return;
    367367
    … …  
    418418  [PushExpression(StackType.Code, "CODE.EXTRACT")]
    419419  public class CodeExtractExpression : StatelessExpression {
    420     public override void Eval(IPushGpInterpreter interpreter) {
     420    public override void Eval(IPushInterpreter interpreter) {
    421421      if (interpreter.IntegerStack.Count == 0 ||
    422422          interpreter.CodeStack.Count == 0 ||
    … …  
    437437  [PushExpression(StackType.Code, "CODE.FROMBOOLEAN")]
    438438  public class CodeFromBooleanExpression : StatelessExpression {
    439     public override void Eval(IPushGpInterpreter interpreter) {
     439    public override void Eval(IPushInterpreter interpreter) {
    440440      if (interpreter.BooleanStack.Count == 0) return;
    441441
    … …  
    452452  [PushExpression(StackType.Code, "CODE.FROMFLOAT")]
    453453  public class CodeFromFloatExpression : StatelessExpression {
    454     public override void Eval(IPushGpInterpreter interpreter) {
     454    public override void Eval(IPushInterpreter interpreter) {
    455455      if (interpreter.FloatStack.Count == 0) return;
    456456
    … …  
    467467  [PushExpression(StackType.Code, "CODE.FROMINTEGER")]
    468468  public class CodeFromIntegerExpression : StatelessExpression {
    469     public override void Eval(IPushGpInterpreter interpreter) {
     469    public override void Eval(IPushInterpreter interpreter) {
    470470      if (interpreter.IntegerStack.Count == 0) return;
    471471
    … …  
    482482  [PushExpression(StackType.Code, "CODE.FROMNAME")]
    483483  public class CodeFromNameExpression : StatelessExpression {
    484     public override void Eval(IPushGpInterpreter interpreter) {
     484    public override void Eval(IPushInterpreter interpreter) {
    485485      if (interpreter.NameStack.Count == 0) return;
    486486
    … …  
    498498  [PushExpression(StackType.Code, "CODE.CODEINSERT")]
    499499  public class CodeInsertExpression : StatelessExpression {
    500     public override void Eval(IPushGpInterpreter interpreter) {
     500    public override void Eval(IPushInterpreter interpreter) {
    501501      if (interpreter.IntegerStack.Count == 0 ||
    502502          interpreter.CodeStack.Count < 2 ||
    … …  
    533533  [PushExpression(StackType.Code, "CODE.LENGTH")]
    534534  public class CodeLengthExpression : StatelessExpression {
    535     public override void Eval(IPushGpInterpreter interpreter) {
     535    public override void Eval(IPushInterpreter interpreter) {
    536536      if (interpreter.CodeStack.Count == 0) return;
    537537
    … …  
    551551  [PushExpression(StackType.Code, "CODE.LIST")]
    552552  public class CodeListExpression : StatelessExpression {
    553     public override void Eval(IPushGpInterpreter interpreter) {
     553    public override void Eval(IPushInterpreter interpreter) {
    554554      if (interpreter.CodeStack.Count < 2) return;
    555555
    … …  
    568568  [PushExpression(StackType.Code, "CODE.MEMBER")]
    569569  public class CodeMemberExpression : StatelessExpression {
    570     public override void Eval(IPushGpInterpreter interpreter) {
     570    public override void Eval(IPushInterpreter interpreter) {
    571571      if (interpreter.CodeStack.Count < 2) return;
    572572
    … …  
    588588  [PushExpression(StackType.Code, "CODE.NTH")]
    589589  public class CodeNthExpression : StatelessExpression {
    590     public override void Eval(IPushGpInterpreter interpreter) {
     590    public override void Eval(IPushInterpreter interpreter) {
    591591      if ((interpreter.CodeStack.Count == 0) || (interpreter.IntegerStack.Count == 0)) return;
    592592
    … …  
    625625  [PushExpression(StackType.Code, "CODE.NTHCDR")]
    626626  public class CodeNthCdrExpression : StatelessExpression {
    627     public override void Eval(IPushGpInterpreter interpreter) {
     627    public override void Eval(IPushInterpreter interpreter) {
    628628      if ((interpreter.CodeStack.Count == 0) || (interpreter.IntegerStack.Count == 0)) return;
    629629
    … …  
    656656  [PushExpression(StackType.Code, "CODE.NULL")]
    657657  public class CodeNullExpression : StatelessExpression {
    658     public override void Eval(IPushGpInterpreter interpreter) {
     658    public override void Eval(IPushInterpreter interpreter) {
    659659      if (interpreter.CodeStack.Count == 0) return;
    660660
    … …  
    671671  [PushExpression(StackType.Code, "CODE.POSITION")]
    672672  public class CodePositionExpression : StatelessExpression {
    673     public override void Eval(IPushGpInterpreter interpreter) {
     673    public override void Eval(IPushInterpreter interpreter) {
    674674      if (interpreter.CodeStack.Count < 2) return;
    675675
    … …  
    697697  [PushExpression(StackType.Code, "CODE.SIZE")]
    698698  public class CodeSizeExpression : StatelessExpression {
    699     public override void Eval(IPushGpInterpreter interpreter) {
     699    public override void Eval(IPushInterpreter interpreter) {
    700700      if (interpreter.CodeStack.Count == 0) return;
    701701
    … …  
    717717  [PushExpression(StackType.Code, "CODE.SUBST")]
    718718  public class CodeSubstitutionExpression : StatelessExpression {
    719     public override void Eval(IPushGpInterpreter interpreter) {
     719    public override void Eval(IPushInterpreter interpreter) {
    720720      if ((interpreter.CodeStack.Count < 3) || (interpreter.CodeStack.Top.GetType() !=
    721721                                                typeof(ExecExpandExpression))) return;

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

    r14727 r14733  
    3131  [PushExpression(StackType.Code, "CODE.DEFINE")]
    3232  public class CodeDefineExpression : DefineExpression<Expression> {
    33     public override void Eval(IPushGpInterpreter interpreter) {
     33    public override void Eval(IPushInterpreter interpreter) {
    3434      if (interpreter.Configuration.TopLevelPushCode && (interpreter.CodeStack.Count < 2)) return;
    3535
    … …  
    4646  [PushExpression(StackType.Exec, "EXEC.DEFINE")]
    4747  public class ExecDefineExpression : DefineExpression<Expression> {
    48     public override void Eval(IPushGpInterpreter interpreter) {
     48    public override void Eval(IPushInterpreter interpreter) {
    4949      if (interpreter.ExecStack.Count < 2) return;
    5050
    … …  
    6262  public class FloatDefineExpression : DefineExpression<double> {
    6363
    64     public override void Eval(IPushGpInterpreter interpreter) {
     64    public override void Eval(IPushInterpreter interpreter) {
    6565      this.Eval(
    6666        interpreter.FloatStack,
    … …  
    7373  [PushExpression(StackType.Integer, "INTEGER.DEFINE")]
    7474  public class IntegerDefineExpression : DefineExpression<long> {
    75     public override void Eval(IPushGpInterpreter interpreter) {
     75    public override void Eval(IPushInterpreter interpreter) {
    7676      this.Eval(
    7777        interpreter.IntegerStack,
    … …  
    8484  [PushExpression(StackType.Boolean, "BOOLEAN.DEFINE")]
    8585  public class BooleanDefineExpression : DefineExpression<bool> {
    86     public override void Eval(IPushGpInterpreter interpreter) {
     86    public override void Eval(IPushInterpreter interpreter) {
    8787      this.Eval(
    8888        interpreter.BooleanStack,

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

    r14727 r14733  
    88    protected DoCountExpression() { }
    99    protected DoCountExpression(LoopState state) : base(state) { }
    10     protected override bool HasInsufficientArguments(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     10    protected override bool HasInsufficientArguments(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1111      return interpreter.IntegerStack.Count < 1 ||
    1212             sourceStack.Count == 0 ||
    … …  
    1414    }
    1515
    16     protected override LoopState InitState(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     16    protected override LoopState InitState(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1717      var state = new LoopState(
    1818        body: sourceStack.Pop(),
    … …  
    4747    public CodeDoCountExpression(LoopState state) : base(state) { }
    4848
    49     public override void Eval(IPushGpInterpreter interpreter) {
     49    public override void Eval(IPushInterpreter interpreter) {
    5050      this.Eval(interpreter, interpreter.CodeStack);
    5151    }
    … …  
    7575    public ExecDoCountExpression(LoopState state) : base(state) { }
    7676
    77     public override void Eval(IPushGpInterpreter interpreter) {
     77    public override void Eval(IPushInterpreter interpreter) {
    7878      this.Eval(interpreter, interpreter.ExecStack);
    7979    }

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

    r14727 r14733  
    77    protected DoRangeExpression() { }
    88    protected DoRangeExpression(LoopState state) : base(state) { }
    9     protected override bool HasInsufficientArguments(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     9    protected override bool HasInsufficientArguments(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1010      return interpreter.IntegerStack.Count < 2 ||
    1111             sourceStack.Count == 0 ||
    … …  
    1313    }
    1414
    15     protected override LoopState InitState(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     15    protected override LoopState InitState(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1616      var destinationIndex = interpreter.IntegerStack.Pop();
    1717      var incrementor = destinationIndex < interpreter.IntegerStack.Top ? -1 : 1;
    … …  
    5252
    5353    public CodeDoRangeExpression(LoopState state) : base(state) { }
    54     public override void Eval(IPushGpInterpreter interpreter) {
     54    public override void Eval(IPushInterpreter interpreter) {
    5555      this.Eval(interpreter, interpreter.CodeStack);
    5656    }
    … …  
    9090
    9191    public ExecDoRangeExpression(LoopState state) : base(state) { }
    92     public override void Eval(IPushGpInterpreter interpreter) {
     92    public override void Eval(IPushInterpreter interpreter) {
    9393      this.Eval(interpreter, interpreter.ExecStack);
    9494    }

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

    r14727 r14733  
    77    protected DoTimesExpression() { }
    88    protected DoTimesExpression(LoopState state) : base(state) { }
    9     protected override bool HasInsufficientArguments(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     9    protected override bool HasInsufficientArguments(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1010      return (interpreter.IntegerStack.Count < 1) || (sourceStack.Count == 0) || (interpreter.IntegerStack.Top <= 0);
    1111    }
    1212
    13     protected override LoopState InitState(IPushGpInterpreter interpreter, IStack<Expression> sourceStack) {
     13    protected override LoopState InitState(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
    1414      //this.State.Body = sourceStack.Pop();
    1515      //this.State.DestinationIndex = interpreter.IntegerStack.Pop();
    … …  
    2424    }
    2525
    26     protected override void PushIteration(IPushGpInterpreter interpreter) {
     26    protected override void PushIteration(IPushInterpreter interpreter) {
    2727      var newState = new LoopState(State.Body, State.CurrentIndex + this.State.Incrementor, State.DestinationIndex, State.Incrementor);
    2828      var nextLoopExpression = Clone(newState);
    … …  
    3131    }
    3232
    33     protected override void PushLastIteration(IPushGpInterpreter interpreter) {
     33    protected override void PushLastIteration(IPushInterpreter interpreter) {
    3434      interpreter.ExecStack.Push(this.State.Body);
    3535    }
    … …  
    4747    public CodeDoTimesExpression(LoopState state) : base(state) { }
    4848
    49     public override void Eval(IPushGpInterpreter interpreter) {
     49    public override void Eval(IPushInterpreter interpreter) {
    5050      this.Eval(interpreter, interpreter.CodeStack);
    5151    }
    … …  
    7070    public ExecDoTimesExpression(LoopState state) : base(state) { }
    7171
    72     public override void Eval(IPushGpInterpreter interpreter) {
     72    public override void Eval(IPushInterpreter interpreter) {
    7373      this.Eval(interpreter, interpreter.ExecStack);
    7474    }

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

    r14727 r14733  
    2727  [PushExpression(StackType.Integer, "INTEGER.DUP")]
    2828  public class IntegerDuplicateExpression : DuplicateExpression<long> {
    29     public override void Eval(IPushGpInterpreter interpreter) {
     29    public override void Eval(IPushInterpreter interpreter) {
    3030      this.Eval(interpreter.IntegerStack);
    3131    }
    … …  
    3434  [PushExpression(StackType.Float, "FLOAT.DUP")]
    3535  public class FloatDuplicateExpression : DuplicateExpression<double> {
    36     public override void Eval(IPushGpInterpreter interpreter) {
     36    public override void Eval(IPushInterpreter interpreter) {
    3737      this.Eval(interpreter.FloatStack);
    3838    }
    … …  
    4141  [PushExpression(StackType.Boolean, "BOOLEAN.DUP")]
    4242  public class BooleanDuplicateExpression : DuplicateExpression<bool> {
    43     public override void Eval(IPushGpInterpreter interpreter) {
     43    public override void Eval(IPushInterpreter interpreter) {
    4444      this.Eval(interpreter.BooleanStack);
    4545    }
    … …  
    4848  [PushExpression(StackType.Name, "NAME.DUP")]
    4949  public class NameDuplicateExpression : DuplicateExpression<string> {
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      this.Eval(interpreter.NameStack);
    5252    }
    … …  
    5555  [PushExpression(StackType.Exec, "EXEC.DUP")]
    5656  public class ExecDuplicateExpression : DuplicateExpression<Expression> {
    57     public override void Eval(IPushGpInterpreter interpreter) {
     57    public override void Eval(IPushInterpreter interpreter) {
    5858      this.Eval(interpreter.ExecStack);
    5959    }
    … …  
    6262  [PushExpression(StackType.Code, "CODE.DUP")]
    6363  public class CodeDuplicateExpression : DuplicateExpression<Expression> {
    64     public override void Eval(IPushGpInterpreter interpreter) {
     64    public override void Eval(IPushInterpreter interpreter) {
    6565      this.Eval(interpreter.CodeStack);
    6666    }

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

    r14727 r14733  
    2020  [PushExpression(StackType.Integer, "INTEGER.=")]
    2121  public class IntegerEqualsExpression : EqualsExpression<long> {
    22     public override void Eval(IPushGpInterpreter interpreter) {
     22    public override void Eval(IPushInterpreter interpreter) {
    2323      this.Eval(interpreter.IntegerStack, interpreter.BooleanStack);
    2424    }
    … …  
    2727  [PushExpression(StackType.Float, "FLOAT.=")]
    2828  public class FloatEqualsExpression : EqualsExpression<double> {
    29     public override void Eval(IPushGpInterpreter interpreter) {
     29    public override void Eval(IPushInterpreter interpreter) {
    3030      this.Eval(interpreter.FloatStack, interpreter.BooleanStack);
    3131    }
    … …  
    3434  [PushExpression(StackType.Boolean, "BOOLEAN.=")]
    3535  public class BooleanEqualsExpression : EqualsExpression<bool> {
    36     public override void Eval(IPushGpInterpreter interpreter) {
     36    public override void Eval(IPushInterpreter interpreter) {
    3737      this.Eval(interpreter.BooleanStack, interpreter.BooleanStack);
    3838    }
    … …  
    4141  [PushExpression(StackType.Name, "NAME.=")]
    4242  public class NameEqualsExpression : EqualsExpression<string> {
    43     public override void Eval(IPushGpInterpreter interpreter) {
     43    public override void Eval(IPushInterpreter interpreter) {
    4444      this.Eval(interpreter.NameStack, interpreter.BooleanStack);
    4545    }
    … …  
    4848  [PushExpression(StackType.Exec, "EXEC.=")]
    4949  public class ExecEqualsExpression : EqualsExpression<Expression> {
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      this.Eval(interpreter.ExecStack, interpreter.BooleanStack);
    5252    }
    … …  
    5555  [PushExpression(StackType.Code, "CODE.=")]
    5656  public class CodeEqualsExpression : EqualsExpression<Expression> {
    57     public override void Eval(IPushGpInterpreter interpreter) {
     57    public override void Eval(IPushInterpreter interpreter) {
    5858      this.Eval(interpreter.CodeStack, interpreter.BooleanStack);
    5959    }

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

    r14729 r14733  
    99  using Interpreter;
    1010
    11   public class ExecExpandExpression : StatefullExpression<PushProgram> {
     11  public class ExecExpandExpression : StatefulExpression<PushProgram> {
    1212    public static readonly ExecExpandExpression Empty = new ExecExpandExpression();
    1313
    … …  
    3232    }
    3333
    34     public override void Eval(IPushGpInterpreter interpreter) {
     34    public override void Eval(IPushInterpreter interpreter) {
    3535      interpreter.ExecStack.Push(this.State.Expressions);
    3636    }
    … …  
    8181  [PushExpression(StackType.Exec, "EXEC.IF")]
    8282  public class ExecIfExpression : StatelessExpression {
    83     public override void Eval(IPushGpInterpreter interpreter) {
     83    public override void Eval(IPushInterpreter interpreter) {
    8484      // not enough arguments on stack
    8585      if ((interpreter.BooleanStack.Count == 0) || (interpreter.ExecStack.Count < 2)) return;
    … …  
    9898  [PushExpression(StackType.Exec, "EXEC.Y")]
    9999  public class ExecYExpression : StatelessExpression {
    100     public override void Eval(IPushGpInterpreter interpreter) {
     100    public override void Eval(IPushInterpreter interpreter) {
    101101      // not enough arguments on stack
    102102      if (interpreter.ExecStack.Count == 0 ||
    … …  
    119119  [PushExpression(StackType.Exec, "EXEC.K")]
    120120  public class ExecKExpression : StatelessExpression {
    121     public override void Eval(IPushGpInterpreter interpreter) {
     121    public override void Eval(IPushInterpreter interpreter) {
    122122      if (interpreter.ExecStack.Count < 2) return;
    123123
    … …  
    134134  [PushExpression(StackType.Exec, "EXEC.S")]
    135135  public class ExecSExpression : StatelessExpression {
    136     public override void Eval(IPushGpInterpreter interpreter) {
     136    public override void Eval(IPushInterpreter interpreter) {
    137137      if (interpreter.ExecStack.Count < 3) return;
    138138

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

    r14727 r14733  
    2424    }
    2525
    26     public abstract void Eval(IPushGpInterpreter interpreter);
     26    public abstract void Eval(IPushInterpreter interpreter);
    2727
    2828    public override string ToString() {

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

    r14727 r14733  
    6565    private static Dictionary<string, Func<Expression>> GetStatefullExpressionFactory() {
    6666      var dictionary = new Dictionary<string, Func<Expression>>();
    67       var statefullExpressionType = typeof(StatefullExpression<>);
     67      var statefullExpressionType = typeof(StatefulExpression<>);
    6868      var expressionTypes = GetExpressionTypes(statefullExpressionType);
    6969

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

    r14727 r14733  
    1111  [PushExpression(StackType.Float, "FLOAT.+")]
    1212  public class FloatAddExpression : PushResultExpression<double> {
    13     public override void Eval(IPushGpInterpreter interpreter) {
     13    public override void Eval(IPushInterpreter interpreter) {
    1414      Eval(interpreter.FloatStack, 2, values => values[0] + values[1]);
    1515    }
    … …  
    2121  [PushExpression(StackType.Float, "FLOAT.-")]
    2222  public class FloatSubtractExpression : PushResultExpression<double> {
    23     public override void Eval(IPushGpInterpreter interpreter) {
     23    public override void Eval(IPushInterpreter interpreter) {
    2424      this.Eval(interpreter.FloatStack, 2, values => values[0] - values[1]);
    2525    }
    … …  
    3131  [PushExpression(StackType.Float, "FLOAT.*")]
    3232  public class FloatMultiplyExpression : PushResultExpression<double> {
    33     public override void Eval(IPushGpInterpreter interpreter) {
     33    public override void Eval(IPushInterpreter interpreter) {
    3434      this.Eval(interpreter.FloatStack, 2, values => values[0] * values[1]);
    3535    }
    … …  
    4242  [PushExpression(StackType.Float, "FLOAT./")]
    4343  public class FloatDivideExpression : PushResultExpression<double> {
    44     public override void Eval(IPushGpInterpreter interpreter) {
     44    public override void Eval(IPushInterpreter interpreter) {
    4545      this.Eval(interpreter.FloatStack, 2, values => values[0] / values[1], 0);
    4646    }
    … …  
    5656  [PushExpression(StackType.Float, "FLOAT.%")]
    5757  public class FloatModuloExpression : PushResultExpression<double> {
    58     public override void Eval(IPushGpInterpreter interpreter) {
     58    public override void Eval(IPushInterpreter interpreter) {
    5959      this.Eval(interpreter.FloatStack, 2, values => values[0] % values[1], 0);
    6060    }
    … …  
    6666  [PushExpression(StackType.Float, "FLOAT.MIN")]
    6767  public class FloatMinExpression : PushResultExpression<double> {
    68     public override void Eval(IPushGpInterpreter interpreter) {
     68    public override void Eval(IPushInterpreter interpreter) {
    6969      this.Eval(interpreter.FloatStack, 2, values => Math.Min(values[0], values[1]));
    7070    }
    … …  
    7676  [PushExpression(StackType.Float, "FLOAT.MAX")]
    7777  public class FloatMaxExpression : PushResultExpression<double> {
    78     public override void Eval(IPushGpInterpreter interpreter) {
     78    public override void Eval(IPushInterpreter interpreter) {
    7979      this.Eval(interpreter.FloatStack, 2, values => Math.Max(values[0], values[1]));
    8080    }
    … …  
    8686  [PushExpression(StackType.Float, "FLOAT.<")]
    8787  public class FloatSmallerThanExpression : PushResultExpression<double> {
    88     public override void Eval(IPushGpInterpreter interpreter) {
     88    public override void Eval(IPushInterpreter interpreter) {
    8989      this.Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
    9090    }
    … …  
    9696  [PushExpression(StackType.Float, "FLOAT.>")]
    9797  public class FloatGreaterThanExpression : PushResultExpression<double> {
    98     public override void Eval(IPushGpInterpreter interpreter) {
     98    public override void Eval(IPushInterpreter interpreter) {
    9999      this.Eval(interpreter.FloatStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
    100100    }
    … …  
    106106  [PushExpression(StackType.Float, "FLOAT.SIN")]
    107107  public class FloatSineExpression : PushResultExpression<double> {
    108     public override void Eval(IPushGpInterpreter interpreter) {
     108    public override void Eval(IPushInterpreter interpreter) {
    109109      this.Eval(interpreter.FloatStack, 1, values => Math.Sin(values[0]));
    110110    }
    … …  
    116116  [PushExpression(StackType.Float, "FLOAT.COS")]
    117117  public class FloatCosineExpression : PushResultExpression<double> {
    118     public override void Eval(IPushGpInterpreter interpreter) {
     118    public override void Eval(IPushInterpreter interpreter) {
    119119      this.Eval(interpreter.FloatStack, 1, values => Math.Cos(values[0]));
    120120    }
    … …  
    126126  [PushExpression(StackType.Float, "FLOAT.FROMBOOLEAN")]
    127127  public class FloatFromBooleanExpression : StatelessExpression {
    128     public override void Eval(IPushGpInterpreter interpreter) {
     128    public override void Eval(IPushInterpreter interpreter) {
    129129      if (interpreter.BooleanStack.Count == 0) return;
    130130
    … …  
    141141  [PushExpression(StackType.Float, "FLOAT.FROMINTEGER")]
    142142  public class FloatFromIntegerExpression : StatelessExpression {
    143     public override void Eval(IPushGpInterpreter interpreter) {
     143    public override void Eval(IPushInterpreter interpreter) {
    144144      if (interpreter.IntegerStack.Count == 0) return;
    145145

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

    r14727 r14733  
    1717  [PushExpression(StackType.Integer, "INTEGER.FLUSH")]
    1818  public class IntegerFlushExpression : FlushExpression<long> {
    19     public override void Eval(IPushGpInterpreter interpreter) {
     19    public override void Eval(IPushInterpreter interpreter) {
    2020      Eval(interpreter.IntegerStack);
    2121    }
    … …  
    2424  [PushExpression(StackType.Float, "FLOAT.FLUSH")]
    2525  public class FloatFlushExpression : FlushExpression<double> {
    26     public override void Eval(IPushGpInterpreter interpreter) {
     26    public override void Eval(IPushInterpreter interpreter) {
    2727      Eval(interpreter.FloatStack);
    2828    }
    … …  
    3131  [PushExpression(StackType.Boolean, "BOOLEAN.FLUSH")]
    3232  public class BooleanFlushExpression : FlushExpression<bool> {
    33     public override void Eval(IPushGpInterpreter interpreter) {
     33    public override void Eval(IPushInterpreter interpreter) {
    3434      Eval(interpreter.BooleanStack);
    3535    }
    … …  
    3838  [PushExpression(StackType.Name, "NAME.FLUSH")]
    3939  public class NameFlushExpression : FlushExpression<string> {
    40     public override void Eval(IPushGpInterpreter interpreter) {
     40    public override void Eval(IPushInterpreter interpreter) {
    4141      Eval(interpreter.NameStack);
    4242    }
    … …  
    4545  [PushExpression(StackType.Exec, "EXEC.FLUSH")]
    4646  public class ExecFlushExpression : FlushExpression<Expression> {
    47     public override void Eval(IPushGpInterpreter interpreter) {
     47    public override void Eval(IPushInterpreter interpreter) {
    4848      Eval(interpreter.ExecStack);
    4949    }
    … …  
    5252  [PushExpression(StackType.Code, "CODE.FLUSH")]
    5353  public class CodeFlushExpression : FlushExpression<Expression> {
    54     public override void Eval(IPushGpInterpreter interpreter) {
     54    public override void Eval(IPushInterpreter interpreter) {
    5555      Eval(interpreter.CodeStack);
    5656    }

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

    r14727 r14733  
    1212  [PushExpression(StackType.Integer, "INTEGER.+")]
    1313  public class IntegerAddExpression : PushResultExpression<long> {
    14     public override void Eval(IPushGpInterpreter interpreter) {
     14    public override void Eval(IPushInterpreter interpreter) {
    1515      this.Eval(interpreter.IntegerStack, 2, values => values[0] + values[1]);
    1616    }
    … …  
    2222  [PushExpression(StackType.Integer, "INTEGER.-")]
    2323  public class IntegerSubtractExpression : PushResultExpression<long> {
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      this.Eval(interpreter.IntegerStack, 2, values => values[0] - values[1]);
    2626    }
    … …  
    3232  [PushExpression(StackType.Integer, "INTEGER.*")]
    3333  public class IntegerMultiplyExpression : PushResultExpression<long> {
    34     public override void Eval(IPushGpInterpreter interpreter) {
     34    public override void Eval(IPushInterpreter interpreter) {
    3535      this.Eval(interpreter.IntegerStack, 2, values => values[0] * values[1]);
    3636    }
    … …  
    4343  [PushExpression(StackType.Integer, "INTEGER./")]
    4444  public class IntegerDivideExpression : PushResultExpression<long> {
    45     public override void Eval(IPushGpInterpreter interpreter) {
     45    public override void Eval(IPushInterpreter interpreter) {
    4646      this.Eval(interpreter.IntegerStack, 2, values => values[0] / values[1], 0);
    4747    }
    … …  
    5858  [PushExpression(StackType.Integer, "INTEGER.%")]
    5959  public class IntegerModuloExpression : PushResultExpression<long> {
    60     public override void Eval(IPushGpInterpreter interpreter) {
     60    public override void Eval(IPushInterpreter interpreter) {
    6161      this.Eval(interpreter.IntegerStack, 2, values => values[0] % values[1], 0);
    6262    }
    … …  
    6868  [PushExpression(StackType.Integer, "INTEGER.MIN")]
    6969  public class IntegerMinExpression : PushResultExpression<long> {
    70     public override void Eval(IPushGpInterpreter interpreter) {
     70    public override void Eval(IPushInterpreter interpreter) {
    7171      this.Eval(interpreter.IntegerStack, 2, values => Math.Min(values[0], values[1]));
    7272    }
    … …  
    7878  [PushExpression(StackType.Integer, "INTEGER.MAX")]
    7979  public class IntegerMaxExpression : PushResultExpression<long> {
    80     public override void Eval(IPushGpInterpreter interpreter) {
     80    public override void Eval(IPushInterpreter interpreter) {
    8181      this.Eval(interpreter.IntegerStack, 2, values => Math.Max(values[0], values[1]));
    8282    }
    … …  
    8888  [PushExpression(StackType.Integer, "INTEGER.<")]
    8989  public class IntegerSmallerThanExpression : PushResultExpression<long> {
    90     public override void Eval(IPushGpInterpreter interpreter) {
     90    public override void Eval(IPushInterpreter interpreter) {
    9191      this.Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] < values[1]);
    9292    }
    … …  
    9898  [PushExpression(StackType.Integer, "INTEGER.>")]
    9999  public class IntegerGreaterThanExpression : PushResultExpression<long> {
    100     public override void Eval(IPushGpInterpreter interpreter) {
     100    public override void Eval(IPushInterpreter interpreter) {
    101101      this.Eval(interpreter.IntegerStack, interpreter.BooleanStack, 2, values => values[0] > values[1]);
    102102    }
    … …  
    108108  [PushExpression(StackType.Integer, "INTEGER.FROMBOOLEAN")]
    109109  public class IntegerFromBooleanExpression : StatelessExpression {
    110     public override void Eval(IPushGpInterpreter interpreter) {
     110    public override void Eval(IPushInterpreter interpreter) {
    111111      if (interpreter.BooleanStack.Count == 0) return;
    112112
    … …  
    123123  [PushExpression(StackType.Integer, "INTEGER.FROMFLOAT")]
    124124  public class IntegerFromFloatExpression : StatelessExpression {
    125     public override void Eval(IPushGpInterpreter interpreter) {
     125    public override void Eval(IPushInterpreter interpreter) {
    126126      if (interpreter.FloatStack.Count == 0) return;
    127127

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

    r14727 r14733  
    3232  }
    3333
    34   public abstract class LoopExpression : StatefullExpression<LoopState> {
     34  public abstract class LoopExpression : StatefulExpression<LoopState> {
    3535    protected LoopExpression() : base(new LoopState()) { }
    3636    protected LoopExpression(LoopState state) : base(state) { }
    3737
    38     protected void Eval(IPushGpInterpreter interpreter, IStack<Expression> sourceStack, bool pushCurrentIndex = false) {
     38    protected void Eval(IPushInterpreter interpreter, IStack<Expression> sourceStack, bool pushCurrentIndex = false) {
    3939      // if not initialized
    4040      if (this.State.Body == null) {
    … …  
    5959    protected abstract LoopExpression Clone(LoopState state);
    6060
    61     protected virtual void PushIteration(IPushGpInterpreter interpreter) {
     61    protected virtual void PushIteration(IPushInterpreter interpreter) {
    6262      interpreter.IntegerStack.Push(this.State.CurrentIndex);
    6363
    … …  
    6868    }
    6969
    70     protected virtual void PushLastIteration(IPushGpInterpreter interpreter) {
     70    protected virtual void PushLastIteration(IPushInterpreter interpreter) {
    7171      interpreter.IntegerStack.Push(this.State.CurrentIndex);
    7272      interpreter.ExecStack.Push(this.State.Body);
    … …  
    9595    //}
    9696
    97     protected abstract bool HasInsufficientArguments(IPushGpInterpreter interpreter, IStack<Expression> sourceStack);
     97    protected abstract bool HasInsufficientArguments(IPushInterpreter interpreter, IStack<Expression> sourceStack);
    9898
    99     protected abstract LoopState InitState(IPushGpInterpreter interpreter, IStack<Expression> sourceStack);
     99    protected abstract LoopState InitState(IPushInterpreter interpreter, IStack<Expression> sourceStack);
    100100  }
    101101}

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

    r14727 r14733  
    55  using Interpreter;
    66
    7   public class NameDefineXExecExpression : StatefullExpression<string> {
     7  public class NameDefineXExecExpression : StatefulExpression<string> {
    88    public NameDefineXExecExpression(string state) : base(state) { }
    99
    10     public override void Eval(IPushGpInterpreter interpreter) {
     10    public override void Eval(IPushInterpreter interpreter) {
    1111      Expression expression;
    1212      if (!interpreter.IsNameQuoteFlagSet &&
    … …  
    3131  [PushExpression(StackType.Name, "NAME.QUOTE")]
    3232  public class NameQuoteExpression : StatelessExpression {
    33     public override void Eval(IPushGpInterpreter interpreter) {
     33    public override void Eval(IPushInterpreter interpreter) {
    3434      interpreter.IsNameQuoteFlagSet = true;
    3535    }
    … …  
    4141  [PushExpression(StackType.Name, "NAME.RANDBOUNDNAME")]
    4242  public class NameRandBoundNameExpression : StatelessExpression {
    43     public override void Eval(IPushGpInterpreter interpreter) {
     43    public override void Eval(IPushInterpreter interpreter) {
    4444      if (interpreter.CustomExpressions.Count == 0)
    4545        return;

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

    r14727 r14733  
    1515  [PushExpression(StackType.Integer, "INTEGER.POP")]
    1616  public class IntegerPopExpression : PopExpression<long> {
    17     public override void Eval(IPushGpInterpreter interpreter) {
     17    public override void Eval(IPushInterpreter interpreter) {
    1818      this.Eval(interpreter.IntegerStack);
    1919    }
    … …  
    2222  [PushExpression(StackType.Float, "FLOAT.POP")]
    2323  public class FloatPopExpression : PopExpression<double> {
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      this.Eval(interpreter.FloatStack);
    2626    }
    … …  
    2929  [PushExpression(StackType.Boolean, "BOOLEAN.POP")]
    3030  public class BooleanPopExpression : PopExpression<bool> {
    31     public override void Eval(IPushGpInterpreter interpreter) {
     31    public override void Eval(IPushInterpreter interpreter) {
    3232      this.Eval(interpreter.BooleanStack);
    3333    }
    … …  
    3636  [PushExpression(StackType.Name, "NAME.POP")]
    3737  public class NamePopExpression : PopExpression<string> {
    38     public override void Eval(IPushGpInterpreter interpreter) {
     38    public override void Eval(IPushInterpreter interpreter) {
    3939      this.Eval(interpreter.NameStack);
    4040    }
    … …  
    4343  [PushExpression(StackType.Exec, "EXEC.POP")]
    4444  public class ExecPopExpression : PopExpression<Expression> {
    45     public override void Eval(IPushGpInterpreter interpreter) {
     45    public override void Eval(IPushInterpreter interpreter) {
    4646      this.Eval(interpreter.ExecStack);
    4747    }
    … …  
    5050  [PushExpression(StackType.Code, "CODE.POP")]
    5151  public class CodePopExpression : PopExpression<Expression> {
    52     public override void Eval(IPushGpInterpreter interpreter) {
     52    public override void Eval(IPushInterpreter interpreter) {
    5353      this.Eval(interpreter.CodeStack);
    5454    }

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

    r14727 r14733  
    33  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
    44
    5   public abstract class PushExpression<T> : StatefullExpression<T> {
     5  public abstract class PushExpression<T> : StatefulExpression<T> {
    66
    77    protected PushExpression(T state) : base(state) { }
    … …  
    1818    }
    1919
    20     public override void Eval(IPushGpInterpreter interpreter) {
     20    public override void Eval(IPushInterpreter interpreter) {
    2121      this.Eval(interpreter.IntegerStack);
    2222    }
    … …  
    2828    }
    2929
    30     public override void Eval(IPushGpInterpreter interpreter) {
     30    public override void Eval(IPushInterpreter interpreter) {
    3131      this.Eval(interpreter.FloatStack);
    3232    }
    … …  
    3838    }
    3939
    40     public override void Eval(IPushGpInterpreter interpreter) {
     40    public override void Eval(IPushInterpreter interpreter) {
    4141      this.Eval(interpreter.BooleanStack);
    4242    }
    … …  
    4848    }
    4949
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      this.Eval(interpreter.NameStack);
    5252    }
    … …  
    5858    }
    5959
    60     public override void Eval(IPushGpInterpreter interpreter) {
     60    public override void Eval(IPushInterpreter interpreter) {
    6161      this.Eval(interpreter.ExecStack);
    6262    }

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

    r14727 r14733  
    1010  [PushExpression(StackType.Name, "NAME.RAND")]
    1111  public class NameRandExpression : StatelessExpression {
    12     public override void Eval(IPushGpInterpreter interpreter) {
     12    public override void Eval(IPushInterpreter interpreter) {
    1313      var name = NameGenerator.RandomName(interpreter.Random);
    1414
    … …  
    2222  [PushExpression(StackType.Integer, "INTEGER.RAND")]
    2323  public class IntegerRandExpression : StatelessExpression {
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      var value = interpreter.Random.Next(
    2626          interpreter.Configuration.MinRandomInteger,
    … …  
    3636  [PushExpression(StackType.Float, "FLOAT.RAND")]
    3737  public class FloatRandExpression : StatelessExpression {
    38     public override void Eval(IPushGpInterpreter interpreter) {
     38    public override void Eval(IPushInterpreter interpreter) {
    3939      var value = interpreter.Random.NextDouble() * (interpreter.Configuration.MaxRandomFloat - interpreter.Configuration.MinRandomFloat) + interpreter.Configuration.MinRandomFloat;
    4040
    … …  
    4848  [PushExpression(StackType.Boolean, "BOOLEAN.RAND")]
    4949  public class BooleanRandExpression : StatelessExpression {
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      var value = interpreter.Random.NextDouble() > 0.5;
    5252
    … …  
    6060  [PushExpression(StackType.Code, "CODE.RAND")]
    6161  public class CodeRandExpression : StatelessExpression {
    62     public override void Eval(IPushGpInterpreter interpreter) {
     62    public override void Eval(IPushInterpreter interpreter) {
    6363      if (interpreter.IntegerStack.Count == 0 ||
    6464          interpreter.IntegerStack.Top < 1) return;

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

    r14727 r14733  
    1616  [PushExpression(StackType.Integer, "INTEGER.ROT")]
    1717  public class IntegerRotateExpression : RotateExpression<long> {
    18     public override void Eval(IPushGpInterpreter interpreter) {
     18    public override void Eval(IPushInterpreter interpreter) {
    1919      Eval(interpreter.IntegerStack);
    2020    }
    … …  
    2323  [PushExpression(StackType.Float, "FLOAT.ROT")]
    2424  public class FloatRotateExpression : RotateExpression<double> {
    25     public override void Eval(IPushGpInterpreter interpreter) {
     25    public override void Eval(IPushInterpreter interpreter) {
    2626      Eval(interpreter.FloatStack);
    2727    }
    … …  
    3030  [PushExpression(StackType.Boolean, "BOOLEAN.ROT")]
    3131  public class BooleanRotateExpression : RotateExpression<bool> {
    32     public override void Eval(IPushGpInterpreter interpreter) {
     32    public override void Eval(IPushInterpreter interpreter) {
    3333      Eval(interpreter.BooleanStack);
    3434    }
    … …  
    3737  [PushExpression(StackType.Name, "NAME.ROT")]
    3838  public class NameRotateExpression : RotateExpression<string> {
    39     public override void Eval(IPushGpInterpreter interpreter) {
     39    public override void Eval(IPushInterpreter interpreter) {
    4040      Eval(interpreter.NameStack);
    4141    }
    … …  
    4444  [PushExpression(StackType.Exec, "EXEC.ROT")]
    4545  public class ExecRotateExpression : RotateExpression<Expression> {
    46     public override void Eval(IPushGpInterpreter interpreter) {
     46    public override void Eval(IPushInterpreter interpreter) {
    4747      Eval(interpreter.ExecStack);
    4848    }
    … …  
    5151  [PushExpression(StackType.Code, "CODE.ROT")]
    5252  public class CodeRotateExpression : RotateExpression<Expression> {
    53     public override void Eval(IPushGpInterpreter interpreter) {
     53    public override void Eval(IPushInterpreter interpreter) {
    5454      Eval(interpreter.CodeStack);
    5555    }

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

    r14727 r14733  
    2222  [PushExpression(StackType.Integer, "INTEGER.SHOVE")]
    2323  public class IntegerShoveExpression : ShoveExpression<long> {
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
    2626    }
    … …  
    2929  [PushExpression(StackType.Float, "FLOAT.SHOVE")]
    3030  public class FloatShoveExpression : ShoveExpression<double> {
    31     public override void Eval(IPushGpInterpreter interpreter) {
     31    public override void Eval(IPushInterpreter interpreter) {
    3232      Eval(interpreter.FloatStack, interpreter.IntegerStack);
    3333    }
    … …  
    3636  [PushExpression(StackType.Boolean, "BOOLEAN.SHOVE")]
    3737  public class BooleanShoveExpression : ShoveExpression<bool> {
    38     public override void Eval(IPushGpInterpreter interpreter) {
     38    public override void Eval(IPushInterpreter interpreter) {
    3939      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    4040    }
    … …  
    4343  [PushExpression(StackType.Name, "NAME.SHOVE")]
    4444  public class NameShoveExpression : ShoveExpression<string> {
    45     public override void Eval(IPushGpInterpreter interpreter) {
     45    public override void Eval(IPushInterpreter interpreter) {
    4646      Eval(interpreter.NameStack, interpreter.IntegerStack);
    4747    }
    … …  
    5050  [PushExpression(StackType.Exec, "EXEC.SHOVE")]
    5151  public class ExecShoveExpression : ShoveExpression<Expression> {
    52     public override void Eval(IPushGpInterpreter interpreter) {
     52    public override void Eval(IPushInterpreter interpreter) {
    5353      Eval(interpreter.ExecStack, interpreter.IntegerStack);
    5454    }
    … …  
    5757  [PushExpression(StackType.Code, "CODE.SHOVE")]
    5858  public class CodeShoveExpression : ShoveExpression<Expression> {
    59     public override void Eval(IPushGpInterpreter interpreter) {
     59    public override void Eval(IPushInterpreter interpreter) {
    6060      Eval(interpreter.CodeStack, interpreter.IntegerStack);
    6161    }

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

    r14727 r14733  
    2222  public class IntegerStackdepthExpression : StackdepthExpression<long> {
    2323
    24     public override void Eval(IPushGpInterpreter interpreter) {
     24    public override void Eval(IPushInterpreter interpreter) {
    2525      Eval(interpreter.IntegerStack, interpreter.IntegerStack, true);
    2626    }
    … …  
    2929  [PushExpression(StackType.Float, "FLOAT.STACKDEPTH")]
    3030  public class FloatStackdepthExpression : StackdepthExpression<double> {
    31     public override void Eval(IPushGpInterpreter interpreter) {
     31    public override void Eval(IPushInterpreter interpreter) {
    3232      Eval(interpreter.FloatStack, interpreter.IntegerStack);
    3333    }
    … …  
    3636  [PushExpression(StackType.Boolean, "BOOLEAN.STACKDEPTH")]
    3737  public class BooleanStackdepthExpression : StackdepthExpression<bool> {
    38     public override void Eval(IPushGpInterpreter interpreter) {
     38    public override void Eval(IPushInterpreter interpreter) {
    3939      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    4040    }
    … …  
    4343  [PushExpression(StackType.Name, "NAME.STACKDEPTH")]
    4444  public class NameStackdepthExpression : StackdepthExpression<string> {
    45     public override void Eval(IPushGpInterpreter interpreter) {
     45    public override void Eval(IPushInterpreter interpreter) {
    4646      Eval(interpreter.NameStack, interpreter.IntegerStack);
    4747    }
    … …  
    5050  [PushExpression(StackType.Exec, "EXEC.STACKDEPTH")]
    5151  public class ExecStackdepthExpression : StackdepthExpression<Expression> {
    52     public override void Eval(IPushGpInterpreter interpreter) {
     52    public override void Eval(IPushInterpreter interpreter) {
    5353      Eval(interpreter.ExecStack, interpreter.IntegerStack);
    5454    }
    … …  
    5757  [PushExpression(StackType.Code, "CODE.STACKDEPTH")]
    5858  public class CodeStackdepthExpression : StackdepthExpression<Expression> {
    59     public override void Eval(IPushGpInterpreter interpreter) {
     59    public override void Eval(IPushInterpreter interpreter) {
    6060      Eval(interpreter.CodeStack, interpreter.IntegerStack);
    6161    }

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

    r14727 r14733  
    33    private readonly int hashCode;
    44    protected StatelessExpression() {
    5       this.hashCode = this.GetType().FullName.GetHashCode();
     5      this.hashCode = this.GetType().GetHashCode();
    66    }
    77

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

    r14727 r14733  
    2020  [PushExpression(StackType.Integer, "INTEGER.SWAP")]
    2121  public class IntegerSwapExpression : SwapExpression<long> {
    22     public override void Eval(IPushGpInterpreter interpreter) {
     22    public override void Eval(IPushInterpreter interpreter) {
    2323      Eval(interpreter.IntegerStack);
    2424    }
    … …  
    2727  [PushExpression(StackType.Float, "FLOAT.SWAP")]
    2828  public class FloatSwapExpression : SwapExpression<double> {
    29     public override void Eval(IPushGpInterpreter interpreter) {
     29    public override void Eval(IPushInterpreter interpreter) {
    3030      Eval(interpreter.FloatStack);
    3131    }
    … …  
    3434  [PushExpression(StackType.Boolean, "BOOLEAN.SWAP")]
    3535  public class BooleanSwapExpression : SwapExpression<bool> {
    36     public override void Eval(IPushGpInterpreter interpreter) {
     36    public override void Eval(IPushInterpreter interpreter) {
    3737      Eval(interpreter.BooleanStack);
    3838    }
    … …  
    4141  [PushExpression(StackType.Name, "NAME.SWAP")]
    4242  public class NameSwapExpression : SwapExpression<string> {
    43     public override void Eval(IPushGpInterpreter interpreter) {
     43    public override void Eval(IPushInterpreter interpreter) {
    4444      Eval(interpreter.NameStack);
    4545    }
    … …  
    4848  [PushExpression(StackType.Exec, "EXEC.SWAP")]
    4949  public class ExecSwapExpression : SwapExpression<Expression> {
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      Eval(interpreter.ExecStack);
    5252    }
    … …  
    5555  [PushExpression(StackType.Code, "CODE.SWAP")]
    5656  public class CodeSwapExpression : SwapExpression<Expression> {
    57     public override void Eval(IPushGpInterpreter interpreter) {
     57    public override void Eval(IPushInterpreter interpreter) {
    5858      Eval(interpreter.CodeStack);
    5959    }

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

    r14727 r14733  
    4848  [PushExpression(StackType.Integer, "INTEGER.YANKDUP")]
    4949  public class IntegerYankDuplicateExpression : YankDuplicateExpression<long> {
    50     public override void Eval(IPushGpInterpreter interpreter) {
     50    public override void Eval(IPushInterpreter interpreter) {
    5151      this.Eval(interpreter.IntegerStack);
    5252    }
    … …  
    5555  [PushExpression(StackType.Float, "FLOAT.YANKDUP")]
    5656  public class FloatYankDuplicateExpression : YankDuplicateExpression<double> {
    57     public override void Eval(IPushGpInterpreter interpreter) {
     57    public override void Eval(IPushInterpreter interpreter) {
    5858      this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
    5959    }
    … …  
    6262  [PushExpression(StackType.Boolean, "BOOLEAN.YANKDUP")]
    6363  public class BooleanYankDuplicateExpression : YankDuplicateExpression<bool> {
    64     public override void Eval(IPushGpInterpreter interpreter) {
     64    public override void Eval(IPushInterpreter interpreter) {
    6565      this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    6666    }
    … …  
    6969  [PushExpression(StackType.Name, "NAME.YANKDUP")]
    7070  public class NameYankDuplicateExpression : YankDuplicateExpression<string> {
    71     public override void Eval(IPushGpInterpreter interpreter) {
     71    public override void Eval(IPushInterpreter interpreter) {
    7272      this.Eval(interpreter.NameStack, interpreter.IntegerStack);
    7373    }
    … …  
    7676  [PushExpression(StackType.Exec, "EXEC.YANKDUP")]
    7777  public class ExecYankDuplicateExpression : YankDuplicateExpression<Expression> {
    78     public override void Eval(IPushGpInterpreter interpreter) {
     78    public override void Eval(IPushInterpreter interpreter) {
    7979      this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
    8080    }
    … …  
    8383  [PushExpression(StackType.Code, "CODE.YANKDUP")]
    8484  public class CodeYankDuplicateExpression : YankDuplicateExpression<Expression> {
    85     public override void Eval(IPushGpInterpreter interpreter) {
     85    public override void Eval(IPushInterpreter interpreter) {
    8686      this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
    8787    }

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

    r14727 r14733  
    2424  [PushExpression(StackType.Integer, "INTEGER.YANK")]
    2525  public class IntegerYankExpression : YankExpression<long> {
    26     public override void Eval(IPushGpInterpreter interpreter) {
     26    public override void Eval(IPushInterpreter interpreter) {
    2727      this.Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
    2828    }
    … …  
    3131  [PushExpression(StackType.Float, "FLOAT.YANK")]
    3232  public class FloatYankExpression : YankExpression<double> {
    33     public override void Eval(IPushGpInterpreter interpreter) {
     33    public override void Eval(IPushInterpreter interpreter) {
    3434      this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
    3535    }
    … …  
    3838  [PushExpression(StackType.Boolean, "BOOLEAN.YANK")]
    3939  public class BooleanYankExpression : YankExpression<bool> {
    40     public override void Eval(IPushGpInterpreter interpreter) {
     40    public override void Eval(IPushInterpreter interpreter) {
    4141      this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    4242    }
    … …  
    4545  [PushExpression(StackType.Name, "NAME.YANK")]
    4646  public class NameYankExpression : YankExpression<string> {
    47     public override void Eval(IPushGpInterpreter interpreter) {
     47    public override void Eval(IPushInterpreter interpreter) {
    4848      this.Eval(interpreter.NameStack, interpreter.IntegerStack);
    4949    }
    … …  
    5252  [PushExpression(StackType.Exec, "EXEC.YANK")]
    5353  public class ExecYankExpression : YankExpression<Expression> {
    54     public override void Eval(IPushGpInterpreter interpreter) {
     54    public override void Eval(IPushInterpreter interpreter) {
    5555      this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
    5656    }
    … …  
    5959  [PushExpression(StackType.Code, "CODE.YANK")]
    6060  public class CodeYankExpression : YankExpression<Expression> {
    61     public override void Eval(IPushGpInterpreter interpreter) {
     61    public override void Eval(IPushInterpreter interpreter) {
    6262      this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
    6363    }
Note: See TracChangeset for help on using the changeset viewer.