Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/02/17 22:03:01 (8 years ago)
Author:
pkimmesw
Message:

#2665 Removed "this" qualifier

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

Legend:

Unmodified
Added
Removed

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Attributes/PushExpressionAttriubte.cs

    r14834 r14908  
    1111
    1212    public PushExpressionAttribute(StackTypes stackType, string expressionName, StackTypes additionalStackDependencies = default(StackTypes)) {
    13       this.StackType = stackType;
    14       this.AdditionalStackDependencies = additionalStackDependencies;
    15       this.ExpressionName = expressionName;
     13      StackType = stackType;
     14      AdditionalStackDependencies = additionalStackDependencies;
     15      ExpressionName = expressionName;
    1616    }
    1717  }

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/List/SkipList.cs

    r14875 r14908  
    5050
    5151    public SkipListNode(T value) {
    52       this.Value = value;
     52      Value = value;
    5353    }
    5454
    … …  
    6262
    6363    public virtual bool IsHeader() {
    64       return this.GetType() == typeof(SkipListNodeHeader<T>);
     64      return GetType() == typeof(SkipListNodeHeader<T>);
    6565    }
    6666
    6767    public virtual bool IsFooter() {
    68       return this.GetType() == typeof(SkipListNodeFooter<T>);
     68      return GetType() == typeof(SkipListNodeFooter<T>);
    6969    }
    7070  }
    … …  
    162162    /// </summary>
    163163    protected void clearEmptyLevels() {
    164       if (this.levels > 1) //more than one level, don't want to remove bottom level
     164      if (levels > 1) //more than one level, don't want to remove bottom level
    165165      {
    166         SkipListNode<T> currentNode = this.topLeft;
    167 
    168         while (currentNode != this.bottomLeft) //do not remove the bottom level
     166        SkipListNode<T> currentNode = topLeft;
     167
     168        while (currentNode != bottomLeft) //do not remove the bottom level
    169169        {
    170170          if (currentNode.IsHeader() && currentNode.Next.IsFooter()) {
    … …  
    181181
    182182            //Update counters
    183             this.levels--;
     183            levels--;
    184184
    185185            currentNode = belowNode; //scan down
    … …  
    197197
    198198      //Add levels to entire list if necessary
    199       int newLevelCount = valueLevels - this.levels; //number of levels missing
     199      int newLevelCount = valueLevels - levels; //number of levels missing
    200200      while (newLevelCount > 0) {
    201201        //Create new level
    … …  
    203203
    204204        //Link down
    205         newLevel.Below = this.topLeft;
    206         this.topLeft.Above = newLevel;
    207         this.topLeft = newLevel; //update reference to most top-left node
     205        newLevel.Below = topLeft;
     206        topLeft.Above = newLevel;
     207        topLeft = newLevel; //update reference to most top-left node
    208208
    209209        //Update counters
    210210        newLevelCount--;
    211         this.levels++;
     211        levels++;
    212212      }
    213213
    214214      //Insert the value in the proper position, creating as many levels as was randomly determined
    215       SkipListNode<T> currentNode = this.topLeft;
     215      SkipListNode<T> currentNode = topLeft;
    216216      SkipListNode<T> lastNodeAbove = null; //keeps track of the upper-level nodes in a tower
    217       int currentLevel = this.levels - 1;
     217      int currentLevel = levels - 1;
    218218
    219219      while (currentLevel >= 0 && currentNode != null) {
    … …  
    256256      }
    257257
    258       this.size++; //update count
     258      size++; //update count
    259259    }
    260260
    … …  
    263263    /// </summary>
    264264    public virtual SkipListNode<T> Find(T value) {
    265       SkipListNode<T> foundNode = this.topLeft;
     265      SkipListNode<T> foundNode = topLeft;
    266266
    267267      //Look for the highest-level node with an element value matching the parameter value
    … …  
    286286    /// </summary>
    287287    public virtual SkipListNode<T> FindLowest(T value) {
    288       SkipListNode<T> valueNode = this.Find(value);
    289       return this.FindLowest(valueNode);
     288      SkipListNode<T> valueNode = Find(value);
     289      return FindLowest(valueNode);
    290290    }
    291291
    … …  
    309309    /// </summary>
    310310    public virtual SkipListNode<T> FindHighest(T value) {
    311       SkipListNode<T> valueNode = this.Find(value);
    312       return this.FindHighest(valueNode);
     311      SkipListNode<T> valueNode = Find(value);
     312      return FindHighest(valueNode);
    313313    }
    314314
    … …  
    332332    /// </summary>
    333333    public virtual bool Contains(T value) {
    334       return (this.Find(value) != null);
     334      return (Find(value) != null);
    335335    }
    336336
    … …  
    339339    /// </summary>
    340340    public virtual bool Remove(T value) {
    341       SkipListNode<T> valueNode = this.FindHighest(value);
    342       return this.Remove(valueNode);
     341      SkipListNode<T> valueNode = FindHighest(value);
     342      return Remove(valueNode);
    343343    }
    344344
    … …  
    352352        //Make sure node is top-level node in it's tower
    353353        if (valueNode.Above != null)
    354           valueNode = this.FindHighest(valueNode);
     354          valueNode = FindHighest(valueNode);
    355355
    356356        //---Delete nodes going down the tower
    … …  
    372372
    373373        //update counter
    374         this.size--;
     374        size--;
    375375
    376376        //Clean up the Skip List by removing levels that are now empty
    377         this.clearEmptyLevels();
     377        clearEmptyLevels();
    378378
    379379        return true;
    … …  
    385385    /// </summary>
    386386    public virtual void Clear() {
    387       SkipListNode<T> currentNode = this.Head;
     387      SkipListNode<T> currentNode = Head;
    388388
    389389      while (currentNode != null) {
    … …  
    391391
    392392        if (!currentNode.IsHeader() && !currentNode.IsFooter()) {
    393           this.Remove(currentNode);
     393          Remove(currentNode);
    394394        }
    395395
    … …  
    409409    /// </summary>
    410410    public virtual void CopyTo(T[] array, int startIndex) {
    411       IEnumerator<T> enumerator = this.GetEnumerator();
     411      IEnumerator<T> enumerator = GetEnumerator();
    412412
    413413      for (int i = startIndex; i < array.Length; i++) {
    … …  
    423423    /// </summary>
    424424    public virtual int GetHeight(T value) {
    425       SkipListNode<T> valueNode = this.FindLowest(value);
    426       return this.GetHeight(valueNode);
     425      SkipListNode<T> valueNode = FindLowest(value);
     426      return GetHeight(valueNode);
    427427    }
    428428
    … …  
    459459    /// </summary>
    460460    IEnumerator IEnumerable.GetEnumerator() {
    461       return this.GetEnumerator();
     461      return GetEnumerator();
    462462    }
    463463
    … …  
    480480      object IEnumerator.Current
    481481      {
    482         get { return this.Current; }
     482        get { return Current; }
    483483      }
    484484
    … …  
    493493      public bool MoveNext() {
    494494        if (current == null)
    495           current = this.skipList.Head.Next; //Head is header node, start after
     495          current = skipList.Head.Next; //Head is header node, start after
    496496        else
    497497          current = current.Next;

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Pool/PooledList.cs

    r14777 r14908  
    77  public class PooledList<T> : List<T>, IPooledObject {
    88    public void Reset() {
    9       this.Clear();
     9      Clear();
    1010    }
    1111  }

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Pool/PooledObject.cs

    r14834 r14908  
    1616
    1717    public virtual void Dispose() {
    18       this.resetor(this.item);
    19       this.pool.Free(this);
     18      resetor(item);
     19      pool.Free(this);
    2020    }
    2121
    2222    public void Reset() {
    23       this.resetor(this.item);
     23      resetor(item);
    2424    }
    2525  }

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree/TreeNode.cs

    r14777 r14908  
    1515
    1616    public void Add(T value) {
    17       this.Children.Add(new TreeNode<T>(value));
     17      Children.Add(new TreeNode<T>(value));
    1818    }
    1919
    2020    public void AddNode(TreeNode<T> node) {
    21       this.Children.Add(node);
     21      Children.Add(node);
    2222    }
    2323

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

    r14875 r14908  
    3636      if (interpreter.Configuration.TopLevelPushCode && (interpreter.CodeStack.Count < 2)) return false;
    3737
    38       this.Eval(
     38      Eval(
    3939        interpreter.CodeStack,
    4040        interpreter.NameStack,
    … …  
    5353      if (interpreter.ExecStack.Count < 2) return false;
    5454
    55       var noop = this.Eval(
     55      var noop = Eval(
    5656        interpreter.ExecStack,
    5757        interpreter.NameStack,
    … …  
    7070
    7171    public override bool Eval(IInternalPushInterpreter interpreter) {
    72       return this.Eval(
     72      return Eval(
    7373        interpreter.FloatStack,
    7474        interpreter.NameStack,
    … …  
    8181  public class IntegerDefineExpression : DefineExpression<long> {
    8282    public override bool Eval(IInternalPushInterpreter interpreter) {
    83       return this.Eval(
     83      return Eval(
    8484        interpreter.IntegerStack,
    8585        interpreter.NameStack,
    … …  
    9292  public class BooleanDefineExpression : DefineExpression<bool> {
    9393    public override bool Eval(IInternalPushInterpreter interpreter) {
    94       return this.Eval(
     94      return Eval(
    9595        interpreter.BooleanStack,
    9696        interpreter.NameStack,

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

    r14834 r14908  
    5252
    5353    public override bool Eval(IInternalPushInterpreter interpreter) {
    54       return this.Eval(interpreter, interpreter.CodeStack);
     54      return Eval(interpreter, interpreter.CodeStack);
    5555    }
    5656
    … …  
    8484
    8585    public override bool Eval(IInternalPushInterpreter interpreter) {
    86       return this.Eval(interpreter, interpreter.ExecStack);
     86      return Eval(interpreter, interpreter.ExecStack);
    8787    }
    8888

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

    r14875 r14908  
    5757    public CodeDoRangeExpression(LoopState state) : base(state) { }
    5858    public override bool Eval(IInternalPushInterpreter interpreter) {
    59       return this.Eval(interpreter, interpreter.CodeStack);
     59      return Eval(interpreter, interpreter.CodeStack);
    6060    }
    6161
    … …  
    9999    public ExecDoRangeExpression(LoopState state) : base(state) { }
    100100    public override bool Eval(IInternalPushInterpreter interpreter) {
    101       return this.Eval(interpreter, interpreter.ExecStack);
     101      return Eval(interpreter, interpreter.ExecStack);
    102102    }
    103103    protected override LoopExpression Clone(LoopState state, IInternalPushInterpreter interpreter) {

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

    r14834 r14908  
    2323
    2424    protected override void PushIteration(IInternalPushInterpreter interpreter) {
    25       var newState = LoopState.Create(interpreter.PoolContainer.LoopStatePool, State.Body, State.CurrentIndex + this.State.Incrementor, State.DestinationIndex, State.Incrementor);
     25      var newState = LoopState.Create(interpreter.PoolContainer.LoopStatePool, State.Body, State.CurrentIndex + State.Incrementor, State.DestinationIndex, State.Incrementor);
    2626      var nextLoopExpression = Clone(newState, interpreter);
    2727
    … …  
    3030
    3131    protected override void PushLastIteration(IInternalPushInterpreter interpreter) {
    32       interpreter.ExecStack.Push(this.State.Body);
     32      interpreter.ExecStack.Push(State.Body);
    3333    }
    3434  }
    … …  
    4747
    4848    public override bool Eval(IInternalPushInterpreter interpreter) {
    49       return this.Eval(interpreter, interpreter.CodeStack);
     49      return Eval(interpreter, interpreter.CodeStack);
    5050    }
    5151
    … …  
    7474
    7575    public override bool Eval(IInternalPushInterpreter interpreter) {
    76       return this.Eval(interpreter, interpreter.ExecStack);
     76      return Eval(interpreter, interpreter.ExecStack);
    7777    }
    7878

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

    r14875 r14908  
    2424  public class IntegerDuplicateExpression : DuplicateExpression<long> {
    2525    public override bool Eval(IInternalPushInterpreter interpreter) {
    26       return this.Eval(interpreter.IntegerStack);
     26      return Eval(interpreter.IntegerStack);
    2727    }
    2828  }
    … …  
    3131  public class FloatDuplicateExpression : DuplicateExpression<double> {
    3232    public override bool Eval(IInternalPushInterpreter interpreter) {
    33       return this.Eval(interpreter.FloatStack);
     33      return Eval(interpreter.FloatStack);
    3434    }
    3535  }
    … …  
    3838  public class BooleanDuplicateExpression : DuplicateExpression<bool> {
    3939    public override bool Eval(IInternalPushInterpreter interpreter) {
    40       return this.Eval(interpreter.BooleanStack);
     40      return Eval(interpreter.BooleanStack);
    4141    }
    4242  }
    … …  
    4545  public class NameDuplicateExpression : DuplicateExpression<string> {
    4646    public override bool Eval(IInternalPushInterpreter interpreter) {
    47       return this.Eval(interpreter.NameStack);
     47      return Eval(interpreter.NameStack);
    4848    }
    4949  }
    … …  
    5252  public class ExecDuplicateExpression : DuplicateExpression<Expression> {
    5353    public override bool Eval(IInternalPushInterpreter interpreter) {
    54       return this.Eval(interpreter.ExecStack);
     54      return Eval(interpreter.ExecStack);
    5555    }
    5656  }
    … …  
    5959  public class CodeDuplicateExpression : DuplicateExpression<Expression> {
    6060    public override bool Eval(IInternalPushInterpreter interpreter) {
    61       return this.Eval(interpreter.CodeStack);
     61      return Eval(interpreter.CodeStack);
    6262    }
    6363  }
    … …  
    6666  public class IntegerVectorDuplicateExpression : DuplicateExpression<List<long>> {
    6767    public override bool Eval(IInternalPushInterpreter interpreter) {
    68       return this.Eval(interpreter.IntegerVectorStack);
     68      return Eval(interpreter.IntegerVectorStack);
    6969    }
    7070  }
    … …  
    7373  public class FloatVectorDuplicateExpression : DuplicateExpression<List<double>> {
    7474    public override bool Eval(IInternalPushInterpreter interpreter) {
    75       return this.Eval(interpreter.FloatVectorStack);
     75      return Eval(interpreter.FloatVectorStack);
    7676    }
    7777  }
    … …  
    8080  public class BooleanVectorDuplicateExpression : DuplicateExpression<List<bool>> {
    8181    public override bool Eval(IInternalPushInterpreter interpreter) {
    82       return this.Eval(interpreter.BooleanVectorStack);
     82      return Eval(interpreter.BooleanVectorStack);
    8383    }
    8484  }
    … …  
    8787  public class StringVectorDuplicateExpression : DuplicateExpression<List<string>> {
    8888    public override bool Eval(IInternalPushInterpreter interpreter) {
    89       return this.Eval(interpreter.StringVectorStack);
     89      return Eval(interpreter.StringVectorStack);
    9090    }
    9191  }

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

    r14905 r14908  
    2525
    2626    public override string ToString() {
    27       return this.StringRepresentation;
     27      return StringRepresentation;
    2828    }
    2929

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

    r14834 r14908  
    4646      var hash = 19;
    4747
    48       if (this.Body != null)
    49         hash = hash * 31 + this.Body.GetHashCode();
     48      if (Body != null)
     49        hash = hash * 31 + Body.GetHashCode();
    5050
    51       hash = hash * 31 + this.CurrentIndex.GetHashCode();
    52       hash = hash * 31 + this.DestinationIndex.GetHashCode();
    53       hash = hash * 31 + this.Incrementor.GetHashCode();
     51      hash = hash * 31 + CurrentIndex.GetHashCode();
     52      hash = hash * 31 + DestinationIndex.GetHashCode();
     53      hash = hash * 31 + Incrementor.GetHashCode();
    5454
    5555      return hash;
    … …  
    6464    protected bool Eval(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack, bool pushCurrentIndex = false) {
    6565      // if not initialized
    66       if (this.State.Body == null) {
    67         if (this.HasInsufficientArguments(interpreter, sourceStack)) return false;
     66      if (State.Body == null) {
     67        if (HasInsufficientArguments(interpreter, sourceStack)) return false;
    6868
    69         var state = this.InitState(interpreter, sourceStack);
     69        var state = InitState(interpreter, sourceStack);
    7070        var initLoopExpression = Clone(state, interpreter);
    7171
    … …  
    7575
    7676      // if loop end reached
    77       if (this.State.DestinationIndex == this.State.CurrentIndex) {
    78         this.PushLastIteration(interpreter);
     77      if (State.DestinationIndex == State.CurrentIndex) {
     78        PushLastIteration(interpreter);
    7979        return true;
    8080      }
    8181
    82       this.PushIteration(interpreter);
     82      PushIteration(interpreter);
    8383
    8484      return true;
    … …  
    100100
    101101    protected virtual void PushIteration(IInternalPushInterpreter interpreter) {
    102       interpreter.IntegerStack.Push(this.State.CurrentIndex);
     102      interpreter.IntegerStack.Push(State.CurrentIndex);
    103103
    104104      var newState = LoopState.Create(

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

    r14875 r14908  
    1010
    1111    protected bool Eval(IPushStack<T> stack) {
    12       stack.Push(this.State);
     12      stack.Push(State);
    1313      return true;
    1414    }
    1515
    16     public override string StringRepresentation { get { return this.State.ToString(); } }
     16    public override string StringRepresentation { get { return State.ToString(); } }
    1717  }
    1818

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

    r14875 r14908  
    4343    public int Count { get { return expressions.Count; } }
    4444
    45     public IReadOnlyList<Expression> Expressions { get { return this.expressions; } }
     45    public IReadOnlyList<Expression> Expressions { get { return expressions; } }
    4646
    4747    public static PushProgram Create(IManagedPool<PushProgram> pool, IReadOnlyList<Expression> expressions) {
    … …  
    152152        return true;
    153153
    154       if (this.GetType() != obj.GetType())
     154      if (GetType() != obj.GetType())
    155155        return false;
    156156
    … …  
    168168
    169169    public override bool Eval(IInternalPushInterpreter interpreter) {
    170       interpreter.ExecStack.Push(this.expressions);
     170      interpreter.ExecStack.Push(expressions);
    171171      return true;
    172172    }
    … …  
    184184      get
    185185      {
    186         return this.IsEmpty
     186        return IsEmpty
    187187            ? 1
    188188            // + 1 because "this" is also counted
    … …  
    192192
    193193    public IEnumerable<Expression> DepthLast() {
    194       foreach (var expr in this.expressions) {
     194      foreach (var expr in expressions) {
    195195        if (expr.IsProgram)
    196196          foreach (var sub in ((PushProgram)expr).DepthLast())
    … …  
    226226
    227227    public IList<Expression> CopyExpressions() {
    228       return new List<Expression>(this.expressions);
     228      return new List<Expression>(expressions);
    229229    }
    230230
    … …  
    233233
    234234      var copy = expressionListPool.Get();
    235       copy.AddRange(this.expressions);
     235      copy.AddRange(expressions);
    236236
    237237      return copy;
    … …  
    241241      var maxDepth = 1;
    242242      for (var i = 0; i < Count; i++) {
    243         var expression = this.expressions[i];
     243        var expression = expressions[i];
    244244        if (!expression.IsProgram) continue;
    245245        var expandExpression = (PushProgram)expression;
    … …  
    265265
    266266      for (var i = Count - 1; i >= 0; i--) {
    267         var subExpression = this.expressions[i];
     267        var subExpression = expressions[i];
    268268
    269269        local_treeIndex[i] = next;
    … …  
    283283
    284284      for (var i = 0; i < Count; i++) {
    285         hash = hash * 31 + this.expressions[i].GetHashCode();
     285        hash = hash * 31 + expressions[i].GetHashCode();
    286286      }
    287287
    … …  
    349349
    350350      return TreeIndex[mid] == index
    351           ? resolver(parent, this, this.expressions[mid], mid, parentIndex)
    352           : (this.expressions[mid + 1] as PushProgram).GetFromTree(index - TreeIndex[mid + 1], mid + 1,
     351          ? resolver(parent, this, expressions[mid], mid, parentIndex)
     352          : (expressions[mid + 1] as PushProgram).GetFromTree(index - TreeIndex[mid + 1], mid + 1,
    353353              this, resolver);
    354354    }

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

    r14777 r14908  
    1111
    1212    protected StatefulExpression(T state) {
    13       this.State = state;
     13      State = state;
    1414    }
    1515
    1616    protected virtual int CalcHashCode() {
    17       return this.State.GetHashCode();
     17      return State.GetHashCode();
    1818    }
    1919
    … …  
    2222      get
    2323      {
    24         if (stringRepresentation == null) stringRepresentation = this.State.ToString();
     24        if (stringRepresentation == null) stringRepresentation = State.ToString();
    2525        return stringRepresentation;
    2626      }
    … …  
    3131        return true;
    3232
    33       if (this.GetType() != obj.GetType())
     33      if (GetType() != obj.GetType())
    3434        return false;
    3535
    3636      var other = (StatefulExpression<T>)obj;
    3737
    38       return ReferenceEquals(this.State, other.State) ||
    39              this.GetHashCode() == other.GetHashCode();
     38      return ReferenceEquals(State, other.State) ||
     39             GetHashCode() == other.GetHashCode();
    4040    }
    4141

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

    r14875 r14908  
    2626  public class IntegerYankDuplicateExpression : YankDuplicateExpression<long> {
    2727    public override bool Eval(IInternalPushInterpreter interpreter) {
    28       return this.Eval(interpreter.IntegerStack, interpreter.IntegerStack);
     28      return Eval(interpreter.IntegerStack, interpreter.IntegerStack);
    2929    }
    3030  }
    … …  
    3333  public class FloatYankDuplicateExpression : YankDuplicateExpression<double> {
    3434    public override bool Eval(IInternalPushInterpreter interpreter) {
    35       return this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
     35      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
    3636    }
    3737  }
    … …  
    4040  public class BooleanYankDuplicateExpression : YankDuplicateExpression<bool> {
    4141    public override bool Eval(IInternalPushInterpreter interpreter) {
    42       return this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     42      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    4343    }
    4444  }
    … …  
    4747  public class NameYankDuplicateExpression : YankDuplicateExpression<string> {
    4848    public override bool Eval(IInternalPushInterpreter interpreter) {
    49       return this.Eval(interpreter.NameStack, interpreter.IntegerStack);
     49      return Eval(interpreter.NameStack, interpreter.IntegerStack);
    5050    }
    5151  }
    … …  
    5454  public class ExecYankDuplicateExpression : YankDuplicateExpression<Expression> {
    5555    public override bool Eval(IInternalPushInterpreter interpreter) {
    56       return this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
     56      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
    5757    }
    5858  }
    … …  
    6161  public class CodeYankDuplicateExpression : YankDuplicateExpression<Expression> {
    6262    public override bool Eval(IInternalPushInterpreter interpreter) {
    63       return this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
     63      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
    6464    }
    6565  }

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

    r14875 r14908  
    2727  public class IntegerYankExpression : YankExpression<long> {
    2828    public override bool Eval(IInternalPushInterpreter interpreter) {
    29       return this.Eval(interpreter.IntegerStack, interpreter.IntegerStack);
     29      return Eval(interpreter.IntegerStack, interpreter.IntegerStack);
    3030    }
    3131  }
    … …  
    3434  public class FloatYankExpression : YankExpression<double> {
    3535    public override bool Eval(IInternalPushInterpreter interpreter) {
    36       return this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
     36      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
    3737    }
    3838  }
    … …  
    4141  public class BooleanYankExpression : YankExpression<bool> {
    4242    public override bool Eval(IInternalPushInterpreter interpreter) {
    43       return this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     43      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
    4444    }
    4545  }
    … …  
    4848  public class NameYankExpression : YankExpression<string> {
    4949    public override bool Eval(IInternalPushInterpreter interpreter) {
    50       return this.Eval(interpreter.NameStack, interpreter.IntegerStack);
     50      return Eval(interpreter.NameStack, interpreter.IntegerStack);
    5151    }
    5252  }
    … …  
    5555  public class ExecYankExpression : YankExpression<Expression> {
    5656    public override bool Eval(IInternalPushInterpreter interpreter) {
    57       return this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
     57      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
    5858    }
    5959  }
    … …  
    6262  public class CodeYankExpression : YankExpression<Expression> {
    6363    public override bool Eval(IInternalPushInterpreter interpreter) {
    64       return this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
     64      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
    6565    }
    6666  }

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs

    r14897 r14908  
    241241
    242242      IsPaused = false;
    243       this.Run();
     243      Run();
    244244    }
    245245
    … …  
    360360
    361361    private Task InterpretAsync() {
    362       currentTask = Task.Run(() => this.Run());
     362      currentTask = Task.Run(() => Run());
    363363
    364364      return currentTask;

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/BenchmarkSuitePushSolutionView.cs

    r14897 r14908  
    3737
    3838    ~BenchmarkSuitePushSolutionView() {
    39       this.interpreter.Dispose();
     39      interpreter.Dispose();
    4040    }
    4141
    4242    private void InitEvents() {
    43       this.exampleComboBox.SelectedIndexChanged += this.SelectedExampleIndexChanged;
    44       this.pushDebugger.OnReset += this.PushDebuggerReset;
     43      exampleComboBox.SelectedIndexChanged += SelectedExampleIndexChanged;
     44      pushDebugger.OnReset += PushDebuggerReset;
    4545    }
    4646
    4747    private void PushDebuggerReset(object sender, IPushInterpreter interpreter) {
    48       if (this.exampleComboBox.SelectedIndex < 0) return;
    49 
    50       var example = Evaluator.Data.Examples[this.exampleComboBox.SelectedIndex];
     48      if (exampleComboBox.SelectedIndex < 0) return;
     49
     50      var example = Evaluator.Data.Examples[exampleComboBox.SelectedIndex];
    5151
    5252      interpreter.BooleanStack.Push(example.InputBoolean);
    … …  
    6262
    6363    private void SelectedExampleIndexChanged(object sender, EventArgs e) {
    64       this.pushDebugger.ResetDebugging();
     64      pushDebugger.ResetDebugging();
    6565    }
    6666
    … …  
    8080
    8181    protected override void OnContentChanged() {
    82       if (this.Content == null) return;
    83 
    84       this.Name = "Push Solution";
    85       this.nameTextBox.Text = this.Name;
    86 
    87       this.pool = new PushInterpreterPool(this.Content.Config);
    88 
    89       if (this.interpreter != null) {
    90         this.interpreter.Dispose();
    91       }
    92 
    93       this.interpreter = this.pool.Create(this.Content.Random);
    94       this.UpdateExamples(Evaluator.Data);
    95 
    96       if (this.exampleComboBox.SelectedIndex < 0) {
    97         this.exampleComboBox.SelectedIndex = 0; // Triggers ResetDebugging via event
    98       }
    99 
    100       this.InitResultGrid();
    101       this.pushDebugger.Content = this.Content;
     82      if (Content == null) return;
     83
     84      Name = "Push Solution";
     85      nameTextBox.Text = Name;
     86
     87      pool = new PushInterpreterPool(Content.Config);
     88
     89      if (interpreter != null) {
     90        interpreter.Dispose();
     91      }
     92
     93      interpreter = pool.Create(Content.Random);
     94      UpdateExamples(Evaluator.Data);
     95
     96      if (exampleComboBox.SelectedIndex < 0) {
     97        exampleComboBox.SelectedIndex = 0; // Triggers ResetDebugging via event
     98      }
     99
     100      InitResultGrid();
     101      pushDebugger.Content = Content;
    102102    }
    103103
    104104    private void InitResultGrid() {
    105       this.resultsDataGrid.Columns.Clear();
    106       this.resultsDataGrid.Rows.Clear();
     105      resultsDataGrid.Columns.Clear();
     106      resultsDataGrid.Rows.Clear();
    107107
    108108      var cellTemplate = new DataGridViewTextBoxCell();
    … …  
    118118
    119119        column.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
    120         this.resultsDataGrid.Columns.Add(column);
     120        resultsDataGrid.Columns.Add(column);
    121121      }
    122122
    … …  
    139139        outputColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
    140140
    141         this.resultsDataGrid.Columns.Add(estimatedOutputColumn);
    142         this.resultsDataGrid.Columns.Add(outputColumn);
     141        resultsDataGrid.Columns.Add(estimatedOutputColumn);
     142        resultsDataGrid.Columns.Add(outputColumn);
    143143      }
    144144
    … …  
    158158      relativeDiffColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
    159159
    160       this.resultsDataGrid.Columns.Add(absoluteDiffColumn);
    161       this.resultsDataGrid.Columns.Add(relativeDiffColumn);
    162 
    163       using (var pushInterpreter = this.pool.Create(this.Content.Random)) {
     160      resultsDataGrid.Columns.Add(absoluteDiffColumn);
     161      resultsDataGrid.Columns.Add(relativeDiffColumn);
     162
     163      using (var pushInterpreter = pool.Create(Content.Random)) {
    164164        for (var i = 0; i < data.Examples.Length; i++) {
    165165          var example = data.Examples[i];
    … …  
    169169
    170170          row.HeaderCell.Value = row.Index + 1;
    171           row.CreateCells(this.resultsDataGrid);
     171          row.CreateCells(resultsDataGrid);
    172172
    173173          for (var j = 0; j < data.InputArgumentTypes.Length; j++) {
    … …  
    177177          for (var j = 0; j < data.OutputArgumentTypes.Length; j++) {
    178178            row.Cells[data.InputArgumentTypes.Length + j * 2].Value = ViewHelper.StringifyOutput(data.OutputArgumentTypes[j], example, Separator);
    179             row.Cells[data.InputArgumentTypes.Length + j * 2 + 1].Value = this.StringifyResult(data.OutputArgumentTypes[j], pushInterpreter, example, Separator);
     179            row.Cells[data.InputArgumentTypes.Length + j * 2 + 1].Value = StringifyResult(data.OutputArgumentTypes[j], pushInterpreter, example, Separator);
    180180          }
    181181
    … …  
    183183          row.Cells[data.TotalArgumentCount + 2].Value = relativeDiff + "%";
    184184
    185           this.resultsDataGrid.Rows.Add(row);
     185          resultsDataGrid.Rows.Add(row);
    186186          pushInterpreter.Reset();
    187187        }
    … …  
    192192      switch (type) {
    193193        case ExampleArgumentType.Integer:
    194         case ExampleArgumentType.IntegerVector: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(this.GetCount(interpreter.IntegerStack, example.OutputInteger)));
     194        case ExampleArgumentType.IntegerVector: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(GetCount(interpreter.IntegerStack, example.OutputInteger)));
    195195
    196196        case ExampleArgumentType.Float:
    197         case ExampleArgumentType.FloatVector: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(this.GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
     197        case ExampleArgumentType.FloatVector: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
    198198
    199199        case ExampleArgumentType.Boolean: return interpreter.BooleanStack.IsEmpty ? EmptySign : interpreter.BooleanStack.Top.ToString();
    … …  
    201201
    202202        case ExampleArgumentType.String:
    203         case ExampleArgumentType.StringVector: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(this.GetCount(interpreter.StringStack, example.OutputString)));
     203        case ExampleArgumentType.StringVector: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(GetCount(interpreter.StringStack, example.OutputString)));
    204204        default: return string.Empty;
    205205      }
    … …  
    211211
    212212    private void UpdateExamples(ProblemData data) {
    213       this.exampleComboBox.Items.Clear();
     213      exampleComboBox.Items.Clear();
    214214      if (data == null) return;
    215215
    … …  
    220220
    221221      foreach (var str in stringRepresentations) {
    222         this.exampleComboBox.Items.Add(str);
     222        exampleComboBox.Items.Add(str);
    223223      }
    224224    }

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs

    r14907 r14908  
    6969
    7070    public void LoadData(ProblemData data) {
    71       this.Data = data;
     71      Data = data;
    7272
    7373      DataBounds.TrainingRange.Start = 0;

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs

    r14897 r14908  
    7272
    7373    private void EnabledExpressionsChanged(object sender, EnabledExpressionsChangedEventArgs e) {
    74       this.Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
    75       this.Encoding.BoundsParameter.Value[0, 1] = config.EnabledExpressions.Count;
     74      Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
     75      Encoding.BoundsParameter.Value[0, 1] = config.EnabledExpressions.Count;
    7676    }
    7777
    … …  
    228228    public IValueParameter<IntValue> MaxPointsInProgramParameter
    229229    {
    230       get { return (IValueParameter<IntValue>)this.Parameters[MaxPointsInProgramParameterName]; }
     230      get { return (IValueParameter<IntValue>)Parameters[MaxPointsInProgramParameterName]; }
    231231    }
    232232
    … …  
    250250    public IValueParameter<IntValue> MinPointsInProgramParameter
    251251    {
    252       get { return (IValueParameter<IntValue>)this.Parameters[MinPointsInProgramParameterName]; }
     252      get { return (IValueParameter<IntValue>)Parameters[MinPointsInProgramParameterName]; }
    253253    }
    254254
    … …  
    287287    public IValueParameter<BoolValue> TopLevelPushCodeParameter
    288288    {
    289       get { return (IValueParameter<BoolValue>)this.Parameters[TopLevelPushCodeParameterName]; }
     289      get { return (IValueParameter<BoolValue>)Parameters[TopLevelPushCodeParameterName]; }
    290290    }
    291291
    … …  
    305305    public IValueParameter<BoolValue> TopLevelPopCodeParameter
    306306    {
    307       get { return (IValueParameter<BoolValue>)this.Parameters[TopLevelPopCodeParameterName]; }
     307      get { return (IValueParameter<BoolValue>)Parameters[TopLevelPopCodeParameterName]; }
    308308    }
    309309

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Selector/LexicaseSelector.cs

    r14875 r14908  
    5656
    5757    public LexicaseSelector() {
    58       this.Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>(
     58      Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>(
    5959        PushProblem.CaseQualitiesScopeParameterName,
    6060        "The quality of every single training case for each individual."));

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PushStack.cs

    r14875 r14908  
    237237
    238238    public bool Remove(T item) {
    239       return this.data.Remove(item);
     239      return data.Remove(item);
    240240    }
    241241
    … …  
    245245
    246246    public void Remove(int count) {
    247       this.data.RemoveRange(this.Count - count, count);
     247      data.RemoveRange(Count - count, count);
    248248    }
    249249
Note: See TracChangeset for help on using the changeset viewer.