Changeset 14908 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data

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/Data

Files:

• List/SkipList.cs (modified) (21 diffs)
• Pool/PooledList.cs (modified) (1 diff)
• Pool/PooledObject.cs (modified) (1 diff)
• Tree/TreeNode.cs (modified) (1 diff)

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

@@ -50 +50 @@
 
     public SkipListNode(T value) {
-      this.Value = value;
+      Value = value;
     }
 
@@ -62 +62 @@
 
     public virtual bool IsHeader() {
-      return this.GetType() == typeof(SkipListNodeHeader<T>);
+      return GetType() == typeof(SkipListNodeHeader<T>);
     }
 
     public virtual bool IsFooter() {
-      return this.GetType() == typeof(SkipListNodeFooter<T>);
+      return GetType() == typeof(SkipListNodeFooter<T>);
     }
   }
@@ -162 +162 @@
     /// </summary>
     protected void clearEmptyLevels() {
-      if (this.levels > 1) //more than one level, don't want to remove bottom level
+      if (levels > 1) //more than one level, don't want to remove bottom level
       {
-        SkipListNode<T> currentNode = this.topLeft;
-
-        while (currentNode != this.bottomLeft) //do not remove the bottom level
+        SkipListNode<T> currentNode = topLeft;
+
+        while (currentNode != bottomLeft) //do not remove the bottom level
         {
           if (currentNode.IsHeader() && currentNode.Next.IsFooter()) {
@@ -181 +181 @@
 
             //Update counters
-            this.levels--;
+            levels--;
 
             currentNode = belowNode; //scan down
@@ -197 +197 @@
 
       //Add levels to entire list if necessary
-      int newLevelCount = valueLevels - this.levels; //number of levels missing
+      int newLevelCount = valueLevels - levels; //number of levels missing
       while (newLevelCount > 0) {
         //Create new level
@@ -203 +203 @@
 
         //Link down
-        newLevel.Below = this.topLeft;
-        this.topLeft.Above = newLevel;
-        this.topLeft = newLevel; //update reference to most top-left node
+        newLevel.Below = topLeft;
+        topLeft.Above = newLevel;
+        topLeft = newLevel; //update reference to most top-left node
 
         //Update counters
         newLevelCount--;
-        this.levels++;
+        levels++;
       }
 
       //Insert the value in the proper position, creating as many levels as was randomly determined
-      SkipListNode<T> currentNode = this.topLeft;
+      SkipListNode<T> currentNode = topLeft;
       SkipListNode<T> lastNodeAbove = null; //keeps track of the upper-level nodes in a tower
-      int currentLevel = this.levels - 1;
+      int currentLevel = levels - 1;
 
       while (currentLevel >= 0 && currentNode != null) {
@@ -256 +256 @@
       }
 
-      this.size++; //update count
+      size++; //update count
     }
 
@@ -263 +263 @@
     /// </summary>
     public virtual SkipListNode<T> Find(T value) {
-      SkipListNode<T> foundNode = this.topLeft;
+      SkipListNode<T> foundNode = topLeft;
 
       //Look for the highest-level node with an element value matching the parameter value
@@ -286 +286 @@
     /// </summary>
     public virtual SkipListNode<T> FindLowest(T value) {
-      SkipListNode<T> valueNode = this.Find(value);
-      return this.FindLowest(valueNode);
+      SkipListNode<T> valueNode = Find(value);
+      return FindLowest(valueNode);
     }
 
@@ -309 +309 @@
     /// </summary>
     public virtual SkipListNode<T> FindHighest(T value) {
-      SkipListNode<T> valueNode = this.Find(value);
-      return this.FindHighest(valueNode);
+      SkipListNode<T> valueNode = Find(value);
+      return FindHighest(valueNode);
     }
 
@@ -332 +332 @@
     /// </summary>
     public virtual bool Contains(T value) {
-      return (this.Find(value) != null);
+      return (Find(value) != null);
     }
 
@@ -339 +339 @@
     /// </summary>
     public virtual bool Remove(T value) {
-      SkipListNode<T> valueNode = this.FindHighest(value);
-      return this.Remove(valueNode);
+      SkipListNode<T> valueNode = FindHighest(value);
+      return Remove(valueNode);
     }
 
@@ -352 +352 @@
         //Make sure node is top-level node in it's tower
         if (valueNode.Above != null)
-          valueNode = this.FindHighest(valueNode);
+          valueNode = FindHighest(valueNode);
 
         //---Delete nodes going down the tower
@@ -372 +372 @@
 
         //update counter
-        this.size--;
+        size--;
 
         //Clean up the Skip List by removing levels that are now empty
-        this.clearEmptyLevels();
+        clearEmptyLevels();
 
         return true;
@@ -385 +385 @@
     /// </summary>
     public virtual void Clear() {
-      SkipListNode<T> currentNode = this.Head;
+      SkipListNode<T> currentNode = Head;
 
       while (currentNode != null) {
@@ -391 +391 @@
 
         if (!currentNode.IsHeader() && !currentNode.IsFooter()) {
-          this.Remove(currentNode);
+          Remove(currentNode);
         }
 
@@ -409 +409 @@
     /// </summary>
     public virtual void CopyTo(T[] array, int startIndex) {
-      IEnumerator<T> enumerator = this.GetEnumerator();
+      IEnumerator<T> enumerator = GetEnumerator();
 
       for (int i = startIndex; i < array.Length; i++) {
@@ -423 +423 @@
     /// </summary>
     public virtual int GetHeight(T value) {
-      SkipListNode<T> valueNode = this.FindLowest(value);
-      return this.GetHeight(valueNode);
+      SkipListNode<T> valueNode = FindLowest(value);
+      return GetHeight(valueNode);
     }
 
@@ -459 +459 @@
     /// </summary>
     IEnumerator IEnumerable.GetEnumerator() {
-      return this.GetEnumerator();
+      return GetEnumerator();
     }
 
@@ -480 +480 @@
       object IEnumerator.Current
       {
-        get { return this.Current; }
+        get { return Current; }
       }
 
@@ -493 +493 @@
       public bool MoveNext() {
         if (current == null)
-          current = this.skipList.Head.Next; //Head is header node, start after
+          current = skipList.Head.Next; //Head is header node, start after
         else
           current = current.Next;

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

@@ -7 +7 @@
   public class PooledList<T> : List<T>, IPooledObject {
     public void Reset() {
-      this.Clear();
+      Clear();
     }
   }

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

@@ -16 +16 @@
 
     public virtual void Dispose() {
-      this.resetor(this.item);
-      this.pool.Free(this);
+      resetor(item);
+      pool.Free(this);
     }
 
     public void Reset() {
-      this.resetor(this.item);
+      resetor(item);
     }
   }

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

@@ -15 +15 @@
 
     public void Add(T value) {
-      this.Children.Add(new TreeNode<T>(value));
+      Children.Add(new TreeNode<T>(value));
     }
 
     public void AddNode(TreeNode<T> node) {
-      this.Children.Add(node);
+      Children.Add(node);
     }