Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/10/17 00:27:31 (7 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/StringExpressions.cs

    r14777 r14834  
    99  [PushExpression(StackTypes.String, "STRING.FROMINTEGER", StackTypes.Integer)]
    1010  public class StringFromIntegerExpression : StatelessExpression {
    11     public override bool Eval(IPushInterpreter interpreter) {
     11    public override bool Eval(IInternalPushInterpreter interpreter) {
    1212      if (interpreter.IntegerStack.IsEmpty)
    1313        return false;
    … …  
    2121  [PushExpression(StackTypes.String, "STRING.FROMFLOAT", StackTypes.Float)]
    2222  public class StringFromFloatExpression : StatelessExpression {
    23     public override bool Eval(IPushInterpreter interpreter) {
     23    public override bool Eval(IInternalPushInterpreter interpreter) {
    2424      if (interpreter.FloatStack.IsEmpty)
    2525        return false;
    … …  
    3333  [PushExpression(StackTypes.String, "STRING.FROMBOOLEAN", StackTypes.Boolean)]
    3434  public class StringFromBooleanExpression : StatelessExpression {
    35     public override bool Eval(IPushInterpreter interpreter) {
     35    public override bool Eval(IInternalPushInterpreter interpreter) {
    3636      if (interpreter.BooleanStack.IsEmpty)
    3737        return false;
    … …  
    4545  [PushExpression(StackTypes.String, "STRING.FROMCHAR", StackTypes.Char)]
    4646  public class StringFromCharExpression : StatelessExpression {
    47     public override bool Eval(IPushInterpreter interpreter) {
     47    public override bool Eval(IInternalPushInterpreter interpreter) {
    4848      if (interpreter.CharStack.IsEmpty)
    4949        return false;
    … …  
    5757  [PushExpression(StackTypes.String, "STRING.CONCAT")]
    5858  public class StringConcatExpression : StatelessExpression {
    59     public override bool Eval(IPushInterpreter interpreter) {
     59    public override bool Eval(IInternalPushInterpreter interpreter) {
    6060      if (interpreter.StringStack.Count < 2 ||
    6161        interpreter.StringStack.Top.Length + interpreter.StringStack.ReverseElementAt(1).Length >= interpreter.Configuration.MaxStringLength)
    … …  
    7373  [PushExpression(StackTypes.String, "STRING.CONJCHAR", StackTypes.Char)]
    7474  public class StringConjCharExpression : StatelessExpression {
    75     public override bool Eval(IPushInterpreter interpreter) {
     75    public override bool Eval(IInternalPushInterpreter interpreter) {
    7676      if (interpreter.StringStack.IsEmpty ||
    7777          interpreter.CharStack.IsEmpty ||
    … …  
    8787  [PushExpression(StackTypes.String, "STRING.TAKE", StackTypes.Integer)]
    8888  public class StringTakeExpression : StatelessExpression {
    89     public override bool Eval(IPushInterpreter interpreter) {
     89    public override bool Eval(IInternalPushInterpreter interpreter) {
    9090      if (interpreter.StringStack.IsEmpty ||
    9191          interpreter.IntegerStack.IsEmpty)
    … …  
    111111  [PushExpression(StackTypes.String, "STRING.SUBSTRING", StackTypes.Integer)]
    112112  public class StringSubstringExpression : StatelessExpression {
    113     public override bool Eval(IPushInterpreter interpreter) {
     113    public override bool Eval(IInternalPushInterpreter interpreter) {
    114114      if (interpreter.StringStack.IsEmpty ||
    115115          interpreter.IntegerStack.Count < 2)
    … …  
    131131  [PushExpression(StackTypes.String, "STRING.FIRST")]
    132132  public class StringFirstExpression : StatelessExpression {
    133     public override bool Eval(IPushInterpreter interpreter) {
     133    public override bool Eval(IInternalPushInterpreter interpreter) {
    134134      if (interpreter.StringStack.IsEmpty ||
    135135          interpreter.StringStack.Top.Length == 0)
    … …  
    144144  [PushExpression(StackTypes.String, "STRING.LAST")]
    145145  public class StringLastExpression : StatelessExpression {
    146     public override bool Eval(IPushInterpreter interpreter) {
     146    public override bool Eval(IInternalPushInterpreter interpreter) {
    147147      if (interpreter.StringStack.IsEmpty ||
    148148          interpreter.StringStack.Top.Length == 0)
    … …  
    158158  [PushExpression(StackTypes.String, "STRING.NTH", StackTypes.Integer)]
    159159  public class StringNthExpression : StatelessExpression {
    160     public override bool Eval(IPushInterpreter interpreter) {
     160    public override bool Eval(IInternalPushInterpreter interpreter) {
    161161      if (interpreter.StringStack.IsEmpty ||
    162162          interpreter.IntegerStack.IsEmpty ||
    … …  
    174174  [PushExpression(StackTypes.String, "STRING.REST")]
    175175  public class StringRestExpression : StatelessExpression {
    176     public override bool Eval(IPushInterpreter interpreter) {
     176    public override bool Eval(IInternalPushInterpreter interpreter) {
    177177      if (interpreter.StringStack.IsEmpty ||
    178178          interpreter.StringStack.Top.Length == 0)
    … …  
    187187  [PushExpression(StackTypes.String, "STRING.BUTLAST")]
    188188  public class StringButLastExpression : StatelessExpression {
    189     public override bool Eval(IPushInterpreter interpreter) {
     189    public override bool Eval(IInternalPushInterpreter interpreter) {
    190190      if (interpreter.StringStack.IsEmpty ||
    191191          interpreter.StringStack.Top.Length == 0)
    … …  
    200200  [PushExpression(StackTypes.String, "STRING.LENGTH", StackTypes.Integer)]
    201201  public class StringLengthExpression : StatelessExpression {
    202     public override bool Eval(IPushInterpreter interpreter) {
     202    public override bool Eval(IInternalPushInterpreter interpreter) {
    203203      if (interpreter.StringStack.IsEmpty)
    204204        return false;
    … …  
    212212  [PushExpression(StackTypes.String, "STRING.REVERSE")]
    213213  public class StringReverseExpression : StatelessExpression {
    214     public override bool Eval(IPushInterpreter interpreter) {
     214    public override bool Eval(IInternalPushInterpreter interpreter) {
    215215      if (interpreter.StringStack.IsEmpty)
    216216        return false;
    … …  
    223223  [PushExpression(StackTypes.String, "STRING.PARSETOCHARS")]
    224224  public class StringParseToCharsExpression : StatelessExpression {
    225     public override bool Eval(IPushInterpreter interpreter) {
     225    public override bool Eval(IInternalPushInterpreter interpreter) {
    226226      if (interpreter.StringStack.IsEmpty)
    227227        return false;
    … …  
    250250  [PushExpression(StackTypes.String, "STRING.SPLIT")]
    251251  public class StringSplitExpression : StatelessExpression {
    252     public override bool Eval(IPushInterpreter interpreter) {
     252    public override bool Eval(IInternalPushInterpreter interpreter) {
    253253      if (interpreter.StringStack.IsEmpty)
    254254        return false;
    … …  
    274274  [PushExpression(StackTypes.String, "STRING.EMPTYSTRING", StackTypes.Boolean)]
    275275  public class StringEmptyStringExpression : StatelessExpression {
    276     public override bool Eval(IPushInterpreter interpreter) {
     276    public override bool Eval(IInternalPushInterpreter interpreter) {
    277277      if (interpreter.StringStack.IsEmpty)
    278278        return false;
    … …  
    289289  [PushExpression(StackTypes.String, "STRING.CONTAINS", StackTypes.Boolean)]
    290290  public class StringContainsExpression : StatelessExpression {
    291     public override bool Eval(IPushInterpreter interpreter) {
     291    public override bool Eval(IInternalPushInterpreter interpreter) {
    292292      if (interpreter.StringStack.Count < 2)
    293293        return false;
    … …  
    304304  [PushExpression(StackTypes.String, "STRING.CONTAINSCHAR", StackTypes.Boolean | StackTypes.Char)]
    305305  public class StringContainsCharExpression : StatelessExpression {
    306     public override bool Eval(IPushInterpreter interpreter) {
     306    public override bool Eval(IInternalPushInterpreter interpreter) {
    307307      if (interpreter.StringStack.IsEmpty ||
    308308          interpreter.CharStack.IsEmpty)
    … …  
    322322  [PushExpression(StackTypes.String, "STRING.INDEXOFCHAR", StackTypes.Integer | StackTypes.Char)]
    323323  public class StringIndexOfCharExpression : StatelessExpression {
    324     public override bool Eval(IPushInterpreter interpreter) {
     324    public override bool Eval(IInternalPushInterpreter interpreter) {
    325325      if (interpreter.StringStack.IsEmpty ||
    326326          interpreter.CharStack.IsEmpty)
    … …  
    340340  [PushExpression(StackTypes.String, "STRING.OCCURENCESOFCHAR", StackTypes.Integer | StackTypes.Char)]
    341341  public class StringOccurrencesOfCharExpression : StatelessExpression {
    342     public override bool Eval(IPushInterpreter interpreter) {
     342    public override bool Eval(IInternalPushInterpreter interpreter) {
    343343      if (interpreter.StringStack.IsEmpty ||
    344344          interpreter.CharStack.IsEmpty)
    … …  
    362362  [PushExpression(StackTypes.String, "STRING.REPLACE")]
    363363  public class StringReplaceExpression : StatelessExpression {
    364     public override bool Eval(IPushInterpreter interpreter) {
     364    public override bool Eval(IInternalPushInterpreter interpreter) {
    365365      if (interpreter.StringStack.Count < 3)
    366366        return false;
    … …  
    383383  /// </summary>
    384384  [PushExpression(StackTypes.String, "STRING.REPLACEFIRST")]
    385   public class StringReplaceFirstExpression : StatelessExpression {
    386     public override bool Eval(IPushInterpreter interpreter) {
     385  public class StringReplaceLastExpression : StatelessExpression {
     386    public override bool Eval(IInternalPushInterpreter interpreter) {
    387387      if (interpreter.StringStack.Count < 3)
    388388        return false;
    … …  
    409409  [PushExpression(StackTypes.String, "STRING.REPLACECHAR", StackTypes.Char)]
    410410  public class StringReplaceCharExpression : StatelessExpression {
    411     public override bool Eval(IPushInterpreter interpreter) {
     411    public override bool Eval(IInternalPushInterpreter interpreter) {
    412412      if (interpreter.StringStack.IsEmpty ||
    413413          interpreter.CharStack.Count < 2)
    … …  
    425425  /// </summary>
    426426  [PushExpression(StackTypes.String, "STRING.REPLACEFIRSTCHAR", StackTypes.Char)]
    427   public class StringReplaceFirstCharExpression : StatelessExpression {
    428     public override bool Eval(IPushInterpreter interpreter) {
     427  public class StringReplaceLastCharExpression : StatelessExpression {
     428    public override bool Eval(IInternalPushInterpreter interpreter) {
    429429      if (interpreter.StringStack.IsEmpty ||
    430430          interpreter.CharStack.Count < 2)
    … …  
    451451  [PushExpression(StackTypes.String, "STRING.REMOVECHAR", StackTypes.Char)]
    452452  public class StringRemoveCharExpression : StatelessExpression {
    453     public override bool Eval(IPushInterpreter interpreter) {
     453    public override bool Eval(IInternalPushInterpreter interpreter) {
    454454      if (interpreter.StringStack.IsEmpty ||
    455455          interpreter.CharStack.IsEmpty)
    … …  
    468468  [PushExpression(StackTypes.String, "STRING.SETCHAR", StackTypes.Char | StackTypes.Integer)]
    469469  public class StringSetCharExpression : StatelessExpression {
    470     public override bool Eval(IPushInterpreter interpreter) {
     470    public override bool Eval(IInternalPushInterpreter interpreter) {
    471471      if (interpreter.StringStack.IsEmpty ||
    472472          interpreter.CharStack.IsEmpty ||
Note: See TracChangeset for help on using the changeset viewer.