Free cookie consent management tool by TermsFeed Policy Generator

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

    r14744 r14777  
    3131  }
    3232
    33   [PushExpression(StackType.Code, "CODE.DEFINE")]
     33  [PushExpression(StackTypes.Code, "CODE.DEFINE", StackTypes.Name)]
    3434  public class CodeDefineExpression : DefineExpression<Expression> {
    3535    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    4848  }
    4949
    50   [PushExpression(StackType.Exec, "EXEC.DEFINE")]
     50  [PushExpression(StackTypes.Exec, "EXEC.DEFINE", StackTypes.Name)]
    5151  public class ExecDefineExpression : DefineExpression<Expression> {
    5252    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    6666  }
    6767
    68   [PushExpression(StackType.Float, "FLOAT.DEFINE")]
     68  [PushExpression(StackTypes.Float, "FLOAT.DEFINE", StackTypes.Name)]
    6969  public class FloatDefineExpression : DefineExpression<double> {
    7070
    … …  
    7878  }
    7979
    80   [PushExpression(StackType.Integer, "INTEGER.DEFINE")]
     80  [PushExpression(StackTypes.Integer, "INTEGER.DEFINE", StackTypes.Name)]
    8181  public class IntegerDefineExpression : DefineExpression<long> {
    8282    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    8989  }
    9090
    91   [PushExpression(StackType.Boolean, "BOOLEAN.DEFINE")]
     91  [PushExpression(StackTypes.Boolean, "BOOLEAN.DEFINE", StackTypes.Name)]
    9292  public class BooleanDefineExpression : DefineExpression<bool> {
    9393    public override bool Eval(IPushInterpreter interpreter) {
    … …  
    9999    }
    100100  }
     101
     102  [PushExpression(StackTypes.Char, "CHAR.DEFINE", StackTypes.Name)]
     103  public class CharDefineExpression : DefineExpression<char> {
     104    public override bool Eval(IPushInterpreter interpreter) {
     105      return Eval(
     106        interpreter.CharStack,
     107        interpreter.NameStack,
     108        interpreter.CustomExpressions,
     109        v => new CharPushExpression(v));
     110    }
     111  }
     112
     113  [PushExpression(StackTypes.String, "STRING.DEFINE", StackTypes.Name)]
     114  public class StringDefineExpression : DefineExpression<string> {
     115    public override bool Eval(IPushInterpreter interpreter) {
     116      return Eval(
     117        interpreter.StringStack,
     118        interpreter.NameStack,
     119        interpreter.CustomExpressions,
     120        v => new StringPushExpression(v));
     121    }
     122  }
    101123}
Note: See TracChangeset for help on using the changeset viewer.