Fixing issue with BTree.

Author: Clément

source/Makefile

@@ -378,7 +378,7 @@ $(FLO_DIR)%.png: $(FLO_DIR)%.txt
 # Graph diagram are only used for 
 # binary trees.
 $(GRA_DIR)%.md: $(GRA_DIR)%.txt | $(GRA_DIR)%.svg $(GRA_DIR)%.png
-	echo "![A binary tree diagram ([text version](./$(basename $@).txt), [image version](./$(basename $@).png), [svg version](./$(basename $@).svg))]($(notdir $(basename $@)).png)" > $@
+	echo "![$$(sed -n '1p' $< | sed -r 's/^.{3}//') ([text version](./$(basename $@).txt), [image version](./$(basename $@).png), [svg version](./$(basename $@).svg))]($(notdir $(basename $@)).png)" > $@
 
 $(GRA_DIR)%.svg: $(GRA_DIR)%.txt
 	@echo "Creating $@"

source/code/projects/Tree/Tree/BSTree.cs

@@ -4,6 +4,7 @@
 public class BSTree<T> : BTree<T>
   where T : IComparable<T>
 {
+  // Inserting into a BSTree
   public override void Insert(T dataP)
   {
     root = Insert(dataP, root);
@@ -32,61 +33,19 @@ private Node Insert(T dataP, Node nodeP)
     return nodeP;
   }
 
-  public override bool Delete(T dataP)
-  {
-    return Delete(dataP, ref root);
-  }
-
-  private bool Delete(T dataP, ref Node nodeP)
-  {
-    bool found = false;
-    if (nodeP != null)
-    {
-      if (dataP.CompareTo(nodeP.Data) < 0) // dataP < nodeP.Data
-      {
-        found = Delete(dataP, ref nodeP.left);
-      }
-      else if (dataP.CompareTo(nodeP.Data) > 0) // dataP > nodeP.Data
-      {
-        found = Delete(dataP, ref nodeP.right);
-      }
-      else // We found the value!
-      {
-        found = true;
-        if (nodeP.left != null && nodeP.right != null)
-        {
-          nodeP.Data = FindMin(nodeP.right);
-          Delete(nodeP.Data, ref nodeP.right);
-                    // Or we could replace with the largest
-                    // value in the left subtree.
-        }
-        else
-        {
-          if (nodeP.left != null)
-          {
-            nodeP = nodeP.left;
-          }
-          else
-          {
-            nodeP = nodeP.right;
-          }
-        }
-      }
-    }
-    return found;
-  }
+  // Finding into a BSTree
 
   public override bool Find(T dataP)
   {
     bool found = false;
     if (root != null)
     {
-      found = Find(root, dataP);
+      found = Find(dataP, root);
     }
     return found;
   }
 
-  private bool Find(Node nodeP, T dataP)
+  private bool Find(T dataP, Node nodeP)
   {
     bool found = false;
     if (nodeP != null)
@@ -99,11 +58,11 @@ private bool Find(Node nodeP, T dataP)
       {
         if (dataP.CompareTo(nodeP.Data) < 0) // dataP < nodeP.Data
         {
-          found = Find(nodeP.left, dataP);
+          found = Find(dataP, nodeP.left);
         }
         else if (dataP.CompareTo(nodeP.Data) > 0) // dataP > nodeP.Data
         {
-          found = Find(nodeP.right, dataP);
+          found = Find(dataP, nodeP.right);
         }
       }
     }
@@ -137,4 +96,52 @@ private T FindMin(Node nodeP)
     }
     return minValue;
   }
+
+  // Deleting from a BSTree
+
+  public override bool Delete(T dataP)
+  {
+    return Delete(dataP, ref root);
+  }
+
+  private bool Delete(T dataP, ref Node nodeP)
+  {
+    bool found = false;
+    if (nodeP != null)
+    {
+      if (dataP.CompareTo(nodeP.Data) < 0) // dataP < nodeP.Data
+      {
+        found = Delete(dataP, ref nodeP.left);
+      }
+      else if (dataP.CompareTo(nodeP.Data) > 0) // dataP > nodeP.Data
+      {
+        found = Delete(dataP, ref nodeP.right);
+      }
+      else // We found the value!
+      {
+        found = true;
+        if (nodeP.left != null && nodeP.right != null)
+        {
+          nodeP.Data = FindMin(nodeP.right);
+          Delete(nodeP.Data, ref nodeP.right);
+          // Or we could replace with the largest
+          // value in the left subtree.
+        }
+        else
+        {
+          if (nodeP.left != null)
+          {
+            nodeP = nodeP.left;
+          }
+          else
+          {
+            nodeP = nodeP.right;
+          }
+        }
+      }
+    }
+    return found;
+  }
+
+  // Done with deletion.
 }