Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/23/17 01:11:18 (8 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/YankExpressions.cs

    r14744 r14777  
    2424  }
    2525
    26   [PushExpression(StackType.Integer, "INTEGER.YANK")]
     26  [PushExpression(StackTypes.Integer, "INTEGER.YANK")]
    2727  public class IntegerYankExpression : YankExpression<long> {
    2828    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    3131  }
    3232
    33   [PushExpression(StackType.Float, "FLOAT.YANK")]
     33  [PushExpression(StackTypes.Float, "FLOAT.YANK", StackTypes.Integer)]
    3434  public class FloatYankExpression : YankExpression<double> {
    3535    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    3838  }
    3939
    40   [PushExpression(StackType.Boolean, "BOOLEAN.YANK")]
     40  [PushExpression(StackTypes.Boolean, "BOOLEAN.YANK", StackTypes.Integer)]
    4141  public class BooleanYankExpression : YankExpression<bool> {
    4242    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    4545  }
    4646
    47   [PushExpression(StackType.Name, "NAME.YANK")]
     47  [PushExpression(StackTypes.Name, "NAME.YANK", StackTypes.Integer)]
    4848  public class NameYankExpression : YankExpression<string> {
    4949    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    5252  }
    5353
    54   [PushExpression(StackType.Exec, "EXEC.YANK")]
     54  [PushExpression(StackTypes.Exec, "EXEC.YANK", StackTypes.Integer)]
    5555  public class ExecYankExpression : YankExpression<Expression> {
    5656    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    5959  }
    6060
    61   [PushExpression(StackType.Code, "CODE.YANK")]
     61  [PushExpression(StackTypes.Code, "CODE.YANK", StackTypes.Integer)]
    6262  public class CodeYankExpression : YankExpression<Expression> {
    6363    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    6565    }
    6666  }
     67
     68  [PushExpression(StackTypes.Char, "CHAR.YANK", StackTypes.Integer)]
     69  public class CharYankExpression : YankExpression<char> {
     70    public override bool Eval(IPushInterpreter interpreter) {
     71      return Eval(interpreter.CharStack, interpreter.IntegerStack);
     72    }
     73  }
     74
     75  [PushExpression(StackTypes.String, "STRING.YANK", StackTypes.Integer)]
     76  public class StringYankExpression : YankExpression<string> {
     77    public override bool Eval(IPushInterpreter interpreter) {
     78      return Eval(interpreter.StringStack, interpreter.IntegerStack);
     79    }
     80  }
    6781}
Note: See TracChangeset for help on using the changeset viewer.