From c6c1d31c389e80fe3763ed255dc8e2b307ef7efa Mon Sep 17 00:00:00 2001
From: Zachary Danz <zsd4yr@virginia.edu>
Date: Thu, 1 Mar 2018 12:31:18 -0500
Subject: [PATCH 1/5] rewrite of remove in AVLTree.cpp to fix memory leak,
 separation of headers to separate files, writting of node classes to avoid
 extraneous work

---
 labs/lab05/code/postlab/AVLNode.cpp        |  34 +++++
 labs/lab05/code/postlab/AVLNode.h          |  19 +++
 labs/lab05/code/postlab/AVLTree.cpp        | 138 +++++++++++++--------
 labs/lab05/code/postlab/AVLTree.h          |  21 ++--
 labs/lab05/code/postlab/BinaryNode.cpp     |  21 ++++
 labs/lab05/code/postlab/BinaryNode.h       |  17 +++
 labs/lab05/code/postlab/BinarySearchTree.h |  12 +-
 7 files changed, 186 insertions(+), 76 deletions(-)
 create mode 100644 labs/lab05/code/postlab/AVLNode.cpp
 create mode 100644 labs/lab05/code/postlab/AVLNode.h
 create mode 100644 labs/lab05/code/postlab/BinaryNode.cpp
 create mode 100644 labs/lab05/code/postlab/BinaryNode.h

diff --git a/labs/lab05/code/postlab/AVLNode.cpp b/labs/lab05/code/postlab/AVLNode.cpp
new file mode 100644
index 000000000..43f96bb29
--- /dev/null
+++ b/labs/lab05/code/postlab/AVLNode.cpp
@@ -0,0 +1,34 @@
+#include "AVLNode.h"
+#include <string>
+
+using namespace std;
+
+AVLNode::AVLNode()
+{
+    value = "";
+    left = NULL;
+    right = NULL;
+    height = 0;
+}
+
+AVLNode::~AVLNode()
+{
+    delete left;
+    delete right;
+
+    // to avoid crash on double deletes
+    left = NULL;
+    right = NULL;
+}
+
+AVLNode& AVLNode::operator=(const AVLNode& other)
+{
+    if (this != &other)
+    {
+        this->value = other.value;
+        this->left = other.left;
+        this->right = other.right;
+        this->height = other.height;
+    }
+    return *this;
+}
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/AVLNode.h b/labs/lab05/code/postlab/AVLNode.h
new file mode 100644
index 000000000..25ae69e01
--- /dev/null
+++ b/labs/lab05/code/postlab/AVLNode.h
@@ -0,0 +1,19 @@
+#ifndef AVL_NODE
+#define AVL_NODE
+
+#include <string>
+
+class AVLNode {
+  AVLNode();
+  ~AVLNode();
+  AVLNode& operator=(const AVLNode& other);
+
+  std::string value;
+  AVLNode* left;
+  AVLNode* right;
+  int depth;
+
+  friend class AVLTree;
+};
+
+#endif //AVL_NODE
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/AVLTree.cpp b/labs/lab05/code/postlab/AVLTree.cpp
index 94aaaa79f..69dd60884 100644
--- a/labs/lab05/code/postlab/AVLTree.cpp
+++ b/labs/lab05/code/postlab/AVLTree.cpp
@@ -1,66 +1,89 @@
+// Feel free to edit this file and add functions as necessary
+
 #include "AVLTree.h"
+#include "AVLNode.h"
 #include <string>
 
 using namespace std;
 
-// Implement the following
-AVLNode::AVLNode() {}
-AVLTree::AVLTree() {}
-AVLTree::~AVLTree() {}
-void AVLTree::insert(const string& x) {}
-string pathTo(const string& x) const {}
-bool find(const string& x) const {}
-int numNodes() const {}
-void balance(AVLNode*& n) {}
-AVLNode* rotateLeft(AVLNode*& n) {}
-AVLNode* rotateRight(AVLNode*& n) {}
+// Implement at least the remaining unimplemented methods in AVLTree.h (see below method skeletons)
+AVLTree::AVLTree() { }
+
+AVLTree::~AVLTree() { }
+
+void AVLTree::insert(const string& x) { }
+string AVLTree::pathTo(const string& x) const { }
+bool AVLTree::find(const string& x) const { }
+int AVLTree::numNodes() const { }
+void AVLTree::balance(AVLNode*& n) { }
+AVLNode* AVLTree::rotateLeft(AVLNode*& n) { }
+AVLNode* AVLTree::rotateRight(AVLNode*& n) { }
 
-// The following are implemented for you
-// remove finds x's position in the tree and removes it, rebalancing as
-// necessary.
-void AVLTree::remove(const string& x) { root = remove(root, x); }
+/** The following are implemented for you: remove, max, min, and height;
+remove finds x's position in the tree and removes it, rebalancing as necessary. **/
+void AVLTree::remove(const string& x) { if(remove(root, x)) balance(root); }
 
-// private helper for remove to allow recursion over different nodes. returns
-// an AVLNode* that is assigned to the original node.
-AVLNode* AVLTree::remove(AVLNode*& n, const string& x) {
-  if (n == NULL) {
-    return NULL;
+/** private helper for remove to allow recursion over different nodes; 
+returns an AVLNode* that is assigned to the original node. **/
+bool AVLTree::remove(AVLNode*& current, const string& x) {
+  // base-case for x not present in tree
+  if (current == NULL) 
+  {
+    return false;
   }
-  // first look for x
-  if (x == n->value) {
-    // found
+  // recursively approach base case to left
+  else if (x < current->value)
+  {
+    return remove(current->left, x);
+  }
+  // recursively approach base case to right
+  else if (x > current->value)
+  {
+    return remove(current->right, x);
+  }
+  // base-case for x present in tree
+  else
+  {
     // no children
-    if (n->left == NULL && n->right == NULL) {
-      delete n;
-      return NULL;
+    if(current->left == NULL && current->right == NULL)
+    {
+      delete current;
+      current = NULL;
+      return (current == NULL); // should be true
     }
-    // single child
-    if (n->left == NULL) {
-      return n->right;
+    // two children
+    else if (current-> left != NULL && current->right != NULL)
+    {
+      AVLNode *rLMost = current->right;
+      // find leftmost node in right subtree iteratively
+      // this value is the lowest of the values higher than our current value
+      // i.e. the middle-most value of this (sub)tree
+      while(rLMost->left != NULL)
+      {
+        rLMost = rLMost->left;
+      }
+      // replace current with rLMost (value only)
+      current->value = rLMost->value;
+      // this should immediately reach either base-case present
+      // with (above) no children or (below) one child, the right
+      // just one more recurse.
+      return remove(rLMost, rLMost->value);
     }
-    if (n->right == NULL) {
-      return n->left;
+    // one child
+    else
+    {
+      // if right is not null, then child is right; otherwise child is left
+      AVLNode* child = (current->right != NULL) ? current->right : current->left;
+      // replace current with child but keep height
+      int heightTemp = current->height;
+      current = child;
+      current->height = heightTemp;
+      delete child;
+      child = NULL;
+      return (child == NULL); //should be true
     }
-    // two children -- tree may become unbalanced after deleting n
-    string sr = min(n->right);
-    n->value = sr;
-    n->right = remove(n->right, sr);
-  } else if (x < n->value) {
-    n->left = remove(n->left, x);
-  } else {
-    n->right = remove(n->right, x);
   }
-  n->height = 1 + max(height(n->left), height(n->right));
-  balance(n);
-  return n;
-}
-
-// max returns the greater of two integers.
-int max(int a, int b) {
-  if (a > b) {
-    return a;
-  }
-  return b;
+  // recall that if this returns true, balance(root) will be called, fixing any inbalance
 }
 
 // min finds the string with the smallest value in a subtree.
@@ -72,11 +95,20 @@ string AVLTree::min(AVLNode* node) const {
   return min(node->left);
 }
 
-// height returns the value of the height field in a node. If the node is
-// null, it returns -1.
+/** height returns the value of the height field in a node. 
+If the node is null, it returns 0. **/
 int AVLTree::height(AVLNode* node) const {
   if (node == NULL) {
-    return -1;
+    return 0;
   }
   return node->height;
+}
+
+// non-member(s)
+// max returns the greater of two integers.
+int max(int a, int b) {
+  if (a > b) {
+    return a;
+  }
+  return b;
 }
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/AVLTree.h b/labs/lab05/code/postlab/AVLTree.h
index 28a05b816..e46934ef2 100644
--- a/labs/lab05/code/postlab/AVLTree.h
+++ b/labs/lab05/code/postlab/AVLTree.h
@@ -1,21 +1,13 @@
+// Feel free to edit this file and add functions as necessary
+
 #ifndef AVL_H
 #define AVL_H
 
+#include "AVLNode.h"
 #include <string>
 
 using namespace std;
 
-class AVLNode {
-  AVLNode();
-
-  string value;
-  AVLNode* left;
-  AVLNode* right;
-  int height;
-
-  friend class AVLTree;
-};
-
 class AVLTree {
  public:
   AVLTree();
@@ -49,17 +41,18 @@ class AVLTree {
   AVLNode* rotateRight(AVLNode*& n);
 
   // private helper for remove to allow recursion over different nodes. returns
-  // an AVLNode* that is assigned to the original node.
-  AVLNode* remove(AVLNode*& n, const string& x);
+  // an true if the node is removed; false otherwise
+  bool remove(AVLNode*& n, const string& x);
   // min finds the string with the smallest value in a subtree.
   string min(AVLNode* node) const;
   // height returns the value of the height field in a node. If the node is
-  // null, it returns -1.
+  // null, it returns 0.
   int height(AVLNode* node) const;
 
   // Any other methods you need...
 };
 
+// non-member(s)
 // max returns the greater of two integers.
 int max(int a, int b);
 
diff --git a/labs/lab05/code/postlab/BinaryNode.cpp b/labs/lab05/code/postlab/BinaryNode.cpp
new file mode 100644
index 000000000..0cc4a1489
--- /dev/null
+++ b/labs/lab05/code/postlab/BinaryNode.cpp
@@ -0,0 +1,21 @@
+#include "BinaryNode.h"
+#include <string>
+
+using namespace std;
+
+BinaryNode::BinaryNode()
+{
+    value = "";
+    left = NULL;
+    right = NULL;
+}
+
+BinaryNode~BinaryNode()
+{
+    delete left;
+    delete right;
+
+    // to avoid crash on double deletes
+    left = NULL;
+    right = NULL;
+}
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/BinaryNode.h b/labs/lab05/code/postlab/BinaryNode.h
new file mode 100644
index 000000000..3aca23fe2
--- /dev/null
+++ b/labs/lab05/code/postlab/BinaryNode.h
@@ -0,0 +1,17 @@
+#ifndef BINARY_NODE
+#define BINARY_NODE
+
+#include <string>
+
+class BinaryNode {
+  BinaryNode();
+  ~BinaryNode();
+
+  std::string value;
+  BinaryNode* left;
+  BinaryNode* right;
+
+  friend class BinarySearchTree;
+};
+
+#endif //BINARY_NODE
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/BinarySearchTree.h b/labs/lab05/code/postlab/BinarySearchTree.h
index a443fd352..091516977 100644
--- a/labs/lab05/code/postlab/BinarySearchTree.h
+++ b/labs/lab05/code/postlab/BinarySearchTree.h
@@ -1,15 +1,9 @@
+// Feel free to edit this file and add functions as necessary
+
 #ifndef BST_H
 #define BST_H
 
-class BinaryNode {
-  BinaryNode();
-
-  string value;
-  BinaryNode* left;
-  BinaryNode* right;
-
-  friend class BinarySearchTree;
-};
+#include "BinaryNode.h"
 
 class BinarySearchTree {
  public:

From 5eade62915bd12487943b3e76c4afef19c14301a Mon Sep 17 00:00:00 2001
From: Zachary Danz <zsd4yr@virginia.edu>
Date: Thu, 1 Mar 2018 12:34:13 -0500
Subject: [PATCH 2/5] minor fixes to binary node h and cpp, including ='s
 override

---
 labs/lab05/code/postlab/BinaryNode.cpp | 13 ++++++++++++-
 labs/lab05/code/postlab/BinaryNode.h   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/labs/lab05/code/postlab/BinaryNode.cpp b/labs/lab05/code/postlab/BinaryNode.cpp
index 0cc4a1489..50825dfd4 100644
--- a/labs/lab05/code/postlab/BinaryNode.cpp
+++ b/labs/lab05/code/postlab/BinaryNode.cpp
@@ -10,7 +10,7 @@ BinaryNode::BinaryNode()
     right = NULL;
 }
 
-BinaryNode~BinaryNode()
+BinaryNode::~BinaryNode()
 {
     delete left;
     delete right;
@@ -18,4 +18,15 @@ BinaryNode~BinaryNode()
     // to avoid crash on double deletes
     left = NULL;
     right = NULL;
+}
+
+BinaryNode& BinaryNode::operator=(const BinaryNode& other)
+{
+    if (this != &other)
+    {
+        this->value = other.value;
+        this->left = other.left;
+        this->right = other.right;
+    }
+    return *this;
 }
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/BinaryNode.h b/labs/lab05/code/postlab/BinaryNode.h
index 3aca23fe2..c80afc594 100644
--- a/labs/lab05/code/postlab/BinaryNode.h
+++ b/labs/lab05/code/postlab/BinaryNode.h
@@ -6,6 +6,7 @@
 class BinaryNode {
   BinaryNode();
   ~BinaryNode();
+  BinaryNode& operator=(const BinaryNode& other);
 
   std::string value;
   BinaryNode* left;

From 267bbb4f21975b72a2fd9ce0fe15ff235b18c48d Mon Sep 17 00:00:00 2001
From: Zachary Danz <zsd4yr@virginia.edu>
Date: Thu, 1 Mar 2018 12:39:46 -0500
Subject: [PATCH 3/5] changes to index md and code zip to reflect updates

---
 labs/lab05/code.zip | Bin 14148 -> 160 bytes
 labs/lab05/index.md |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/lab05/code.zip b/labs/lab05/code.zip
index 7974814d54c5bd5af71a3e77bad1d32e60c804b5..282931dbe37d126c8f91e3f2ba8e645943c81949 100644
GIT binary patch
literal 160
zcmWIWW@h1H0D*SyL?18%O0Y7>FeK-vr0R!;a56C0&7B^#(Q-yqX$3a}Bg<Dt1_l-p
spuzxeMkYCCTn0!$jS^sZ>j+{(jbnuvhhY>e8%Pl&5PAb?dk}{K06D@HrT_o{

literal 14148
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
S5D?bwJMOkfNu<5|>Hh%a-sTMe

diff --git a/labs/lab05/index.md b/labs/lab05/index.md
index b938f57ee..093c506c9 100644
--- a/labs/lab05/index.md
+++ b/labs/lab05/index.md
@@ -41,8 +41,8 @@ Procedure
 
 1. For this lab, you will implement a Binary search tree, an AVL tree, and submit a brief lab report electronically via the submission system.
 2. Your report must be in PDF format!  See the [How to convert a file to PDF](../../docs/convert_to_pdf.html) page for details.
-3. Files to download: [BinarySearchTree.h](code/postlab/BinarySearchTree.h.html) ([src](code/postlab/BinarySearchTree.h)), [AVLTree.h](code/postlab/AVLTree.h.html) ([src](code/postlab/AVLTree.h)), [AVLTree.cpp](code/postlab/AVLTree.cpp.html) ([src](code/postlab/AVLTree.cpp)), [TreePathTest.cpp](code/postlab/TreePathTest.cpp.html) ([src](code/postlab/TreePathTest.cpp)), [testfile1.txt](code/postlab/testfile1.txt), [testfile2.txt](code/postlab/testfile2.txt), [testfile3.txt](code/postlab/testfile3.txt). These files are contained in the postlab/ directory of the [code.zip](code.zip) file.
-4. Files to submit: AVLTree.h, BinarySearchTree.h, TreePathTest.cpp, Makefile, any other files needed to make your code compile (files such as AVLTree.cpp, BinarySearchTree.cpp, etc...), analysis.pdf (see the post-lab section for formatting details)
+3. Files to download: [BinaryNode.h](code/postlab/BinaryNode.h.html) ([src](code/postlab/BinaryNode.h)), [BinaryNode.cpp](code/postlab/BinaryNode.cpp.html) ([src](code/postlab/BinaryNode.cpp)), [BinarySearchTree.h](code/postlab/BinarySearchTree.h.html) ([src](code/postlab/BinarySearchTree.h)), [AVLNode.h](code/postlab/AVLNode.h.html) ([src](code/postlab/AVLNode.h)), [AVLNode.cpp](code/postlab/AVLNode.cpp.html) ([src](code/postlab/AVLNode.cpp)), [AVLTree.h](code/postlab/AVLNode.h.html), ([src](code/postlab/AVLTree.h)), [AVLTree.cpp](code/postlab/AVLTree.cpp.html) ([src](code/postlab/AVLTree.cpp)), [TreePathTest.cpp](code/postlab/TreePathTest.cpp.html) ([src](code/postlab/TreePathTest.cpp)), [testfile1.txt](code/postlab/testfile1.txt), [testfile2.txt](code/postlab/testfile2.txt), [testfile3.txt](code/postlab/testfile3.txt). These files are contained in the postlab/ directory of the [code.zip](code.zip) file.
+4. Files to submit: AVLTree.h, BinarySearchTree.h, TreePathTest.cpp, Makefile, any other files needed to make your code compile (files such as AVLTree.cpp, BinarySearchTree.cpp, Node.h's and .cpp's, etc...), analysis.pdf (see the post-lab section for formatting details)
 
 ------------------------------------------------------------
 

From 23acb44b7ca44982c3b4bda4372f7f8a0cbd4ebe Mon Sep 17 00:00:00 2001
From: Zachary Danz <zsd4yr@virginia.edu>
Date: Mon, 12 Mar 2018 13:32:50 -0400
Subject: [PATCH 4/5] changes to remove so that balance works as expected,
 change comment for balance, added pretty postorder print to binarysearchtree
 and avltree, added binarysearchtree.cpp, default returns to all methods that
 require them for on-delivery compile

---
 labs/lab05/code.zip                          | Bin 160 -> 160 bytes
 labs/lab05/code/postlab/AVLNode.h            |   2 +-
 labs/lab05/code/postlab/AVLTree.cpp          |  50 +++++++++++++------
 labs/lab05/code/postlab/AVLTree.h            |  10 +++-
 labs/lab05/code/postlab/BinarySearchTree.cpp |  43 ++++++++++++++++
 labs/lab05/code/postlab/BinarySearchTree.h   |   9 ++++
 6 files changed, 97 insertions(+), 17 deletions(-)
 create mode 100644 labs/lab05/code/postlab/BinarySearchTree.cpp

diff --git a/labs/lab05/code.zip b/labs/lab05/code.zip
index 282931dbe37d126c8f91e3f2ba8e645943c81949..3e7e0a6017ee212c726c3f0696d8a2ddb11cb7b7 100644
GIT binary patch
delta 13
UcmZ3$xPWnj4s-3!WfS!a0U=EV4*&oF

delta 13
UcmZ3$xPWnj4)aFK858vj0Uyl-wEzGB

diff --git a/labs/lab05/code/postlab/AVLNode.h b/labs/lab05/code/postlab/AVLNode.h
index 25ae69e01..82e8369bb 100644
--- a/labs/lab05/code/postlab/AVLNode.h
+++ b/labs/lab05/code/postlab/AVLNode.h
@@ -11,7 +11,7 @@ class AVLNode {
   std::string value;
   AVLNode* left;
   AVLNode* right;
-  int depth;
+  int height;
 
   friend class AVLTree;
 };
diff --git a/labs/lab05/code/postlab/AVLTree.cpp b/labs/lab05/code/postlab/AVLTree.cpp
index 69dd60884..6977c54ec 100644
--- a/labs/lab05/code/postlab/AVLTree.cpp
+++ b/labs/lab05/code/postlab/AVLTree.cpp
@@ -1,8 +1,9 @@
 // Feel free to edit this file and add functions as necessary
-
 #include "AVLTree.h"
 #include "AVLNode.h"
 #include <string>
+#include <iostream>
+#include <iomanip> //for setw in postorder
 
 using namespace std;
 
@@ -12,34 +13,36 @@ AVLTree::AVLTree() { }
 AVLTree::~AVLTree() { }
 
 void AVLTree::insert(const string& x) { }
-string AVLTree::pathTo(const string& x) const { }
-bool AVLTree::find(const string& x) const { }
-int AVLTree::numNodes() const { }
+string AVLTree::pathTo(const string& x) const { return ""; }
+bool AVLTree::find(const string& x) const { return false; }
+int AVLTree::numNodes() const { return -1; }
+// balance should balance only the single node it is given
 void AVLTree::balance(AVLNode*& n) { }
-AVLNode* AVLTree::rotateLeft(AVLNode*& n) { }
-AVLNode* AVLTree::rotateRight(AVLNode*& n) { }
+AVLNode* AVLTree::rotateLeft(AVLNode*& n) { return NULL; }
+AVLNode* AVLTree::rotateRight(AVLNode*& n) { return NULL; }
 
 /** The following are implemented for you: remove, max, min, and height;
 remove finds x's position in the tree and removes it, rebalancing as necessary. **/
-void AVLTree::remove(const string& x) { if(remove(root, x)) balance(root); }
+void AVLTree::remove(const string& x) { remove(root, x); }
 
 /** private helper for remove to allow recursion over different nodes; 
 returns an AVLNode* that is assigned to the original node. **/
 bool AVLTree::remove(AVLNode*& current, const string& x) {
+  bool returnVal = false;
   // base-case for x not present in tree
   if (current == NULL) 
   {
-    return false;
+    returnVal = false;
   }
   // recursively approach base case to left
   else if (x < current->value)
   {
-    return remove(current->left, x);
+    returnVal = remove(current->left, x);
   }
   // recursively approach base case to right
   else if (x > current->value)
   {
-    return remove(current->right, x);
+    returnVal = remove(current->right, x);
   }
   // base-case for x present in tree
   else
@@ -49,7 +52,7 @@ bool AVLTree::remove(AVLNode*& current, const string& x) {
     {
       delete current;
       current = NULL;
-      return (current == NULL); // should be true
+      returnVal = (current == NULL); // should be true
     }
     // two children
     else if (current-> left != NULL && current->right != NULL)
@@ -66,8 +69,8 @@ bool AVLTree::remove(AVLNode*& current, const string& x) {
       current->value = rLMost->value;
       // this should immediately reach either base-case present
       // with (above) no children or (below) one child, the right
-      // just one more recurse.
-      return remove(rLMost, rLMost->value);
+      // just log more recurse; runtime preserved. 
+      returnVal = remove(current->right, rLMost->value);
     }
     // one child
     else
@@ -80,9 +83,11 @@ bool AVLTree::remove(AVLNode*& current, const string& x) {
       current->height = heightTemp;
       delete child;
       child = NULL;
-      return (child == NULL); //should be true
+      returnVal = (child == NULL); //should be true
     }
   }
+  balance(current);
+  return returnVal;
   // recall that if this returns true, balance(root) will be called, fixing any inbalance
 }
 
@@ -104,6 +109,23 @@ int AVLTree::height(AVLNode* node) const {
   return node->height;
 }
 
+void AVLTree::print()
+{
+  postorder(root, 0);
+}
+
+void AVLTree::postorder(AVLNode*& current, int indent)
+{
+    if(current != NULL) {
+        if(current->left != NULL) postorder(current->left, indent+4);
+        if(current->right != NULL) postorder(current->right, indent+4);
+        if (indent) {
+            std::cout << std::setw(indent) << ' ';
+        }
+        std::cout << current->value << std::endl;
+    }
+}
+
 // non-member(s)
 // max returns the greater of two integers.
 int max(int a, int b) {
diff --git a/labs/lab05/code/postlab/AVLTree.h b/labs/lab05/code/postlab/AVLTree.h
index e46934ef2..ec6a6f74e 100644
--- a/labs/lab05/code/postlab/AVLTree.h
+++ b/labs/lab05/code/postlab/AVLTree.h
@@ -28,12 +28,14 @@ class AVLTree {
   // numNodes returns the total number of nodes in the tree.
   int numNodes() const;
 
+  void print();
+
  private:
   // Declare a root node
   AVLNode* root;
 
-  // balance makes sure that the subtree with root n maintains the AVL tree
-  // property, namely that the balance factor of n is either -1, 0, or 1.
+  // balance should balance only the single node it is given
+  // that the balance factor of n is either -1, 0, or 1.
   void balance(AVLNode*& n);
   // rotateLeft performs a single rotation on node n with its left child.
   AVLNode* rotateLeft(AVLNode*& n);
@@ -49,6 +51,10 @@ class AVLTree {
   // null, it returns 0.
   int height(AVLNode* node) const;
 
+  // prints a subtree
+  // call on root for postorder of full tree
+  void postorder(AVLNode* &current, int indent);
+
   // Any other methods you need...
 };
 
diff --git a/labs/lab05/code/postlab/BinarySearchTree.cpp b/labs/lab05/code/postlab/BinarySearchTree.cpp
new file mode 100644
index 000000000..39a20da3e
--- /dev/null
+++ b/labs/lab05/code/postlab/BinarySearchTree.cpp
@@ -0,0 +1,43 @@
+// Feel free to edit this file and add functions as necessary
+#include "BinaryNode.h"
+#include "BinarySearchTree.h"
+#include <string>
+#include <iostream>
+#include <iomanip> //for setw in postorder
+
+using namespace std;
+
+BinarySearchTree::BinarySearchTree() {}
+BinarySearchTree::~BinarySearchTree() {}
+
+// insert finds a position for x in the tree and places it there.
+void BinarySearchTree::insert(const string& x) {}
+// remove finds x's position in the tree and removes it.
+void BinarySearchTree::remove(const string& x) {}
+
+// pathTo finds x in the tree and returns a string representing the path it
+// took to get there.
+string BinarySearchTree::pathTo(const string& x) const { return ""; }
+// find determines whether or not x exists in the tree.
+bool BinarySearchTree::find(const string& x) const { return false; }
+// numNodes returns the total number of nodes in the tree.
+int BinarySearchTree::numNodes() const { return -1; }
+
+void BinarySearchTree::print()
+{
+    postorder(root, 0);
+}
+
+// prints a subtree
+// call on root for postorder of full tree
+void BinarySearchTree::postorder(BinaryNode* &current, int indent)
+{
+    if(current != NULL) {
+        if(current->left) postorder(current->left, indent+4);
+        if(current->right) postorder(current->right, indent+4);
+        if (indent) {
+            std::cout << std::setw(indent) << ' ';
+        }
+        std::cout << current->value << std::endl;
+    }
+}
\ No newline at end of file
diff --git a/labs/lab05/code/postlab/BinarySearchTree.h b/labs/lab05/code/postlab/BinarySearchTree.h
index 091516977..4920ec786 100644
--- a/labs/lab05/code/postlab/BinarySearchTree.h
+++ b/labs/lab05/code/postlab/BinarySearchTree.h
@@ -5,6 +5,8 @@
 
 #include "BinaryNode.h"
 
+using namespace std;
+
 class BinarySearchTree {
  public:
   BinarySearchTree();
@@ -22,12 +24,19 @@ class BinarySearchTree {
   bool find(const string& x) const;
   // numNodes returns the total number of nodes in the tree.
   int numNodes() const;
+  
+  void print();
 
  private:
   // Declare a root node
   BinaryNode* root;
 
+  // prints a subtree
+  // call on root for postorder of full tree
+  void postorder(BinaryNode* &current, int indent);
+
   // Any other methods you need...
 };
 
+
 #endif
\ No newline at end of file

From 3a5b503c6420919c6257489c443147cc88fb4645 Mon Sep 17 00:00:00 2001
From: Zachary Danz <zsd4yr@virginia.edu>
Date: Mon, 12 Mar 2018 13:36:28 -0400
Subject: [PATCH 5/5] left behind change to md

---
 labs/lab05/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/labs/lab05/index.md b/labs/lab05/index.md
index 093c506c9..0f109edb9 100644
--- a/labs/lab05/index.md
+++ b/labs/lab05/index.md
@@ -41,7 +41,7 @@ Procedure
 
 1. For this lab, you will implement a Binary search tree, an AVL tree, and submit a brief lab report electronically via the submission system.
 2. Your report must be in PDF format!  See the [How to convert a file to PDF](../../docs/convert_to_pdf.html) page for details.
-3. Files to download: [BinaryNode.h](code/postlab/BinaryNode.h.html) ([src](code/postlab/BinaryNode.h)), [BinaryNode.cpp](code/postlab/BinaryNode.cpp.html) ([src](code/postlab/BinaryNode.cpp)), [BinarySearchTree.h](code/postlab/BinarySearchTree.h.html) ([src](code/postlab/BinarySearchTree.h)), [AVLNode.h](code/postlab/AVLNode.h.html) ([src](code/postlab/AVLNode.h)), [AVLNode.cpp](code/postlab/AVLNode.cpp.html) ([src](code/postlab/AVLNode.cpp)), [AVLTree.h](code/postlab/AVLNode.h.html), ([src](code/postlab/AVLTree.h)), [AVLTree.cpp](code/postlab/AVLTree.cpp.html) ([src](code/postlab/AVLTree.cpp)), [TreePathTest.cpp](code/postlab/TreePathTest.cpp.html) ([src](code/postlab/TreePathTest.cpp)), [testfile1.txt](code/postlab/testfile1.txt), [testfile2.txt](code/postlab/testfile2.txt), [testfile3.txt](code/postlab/testfile3.txt). These files are contained in the postlab/ directory of the [code.zip](code.zip) file.
+3. Files to download: [BinaryNode.h](code/postlab/BinaryNode.h.html) ([src](code/postlab/BinaryNode.h)), [BinaryNode.cpp](code/postlab/BinaryNode.cpp.html) ([src](code/postlab/BinaryNode.cpp)), [BinarySearchTree.h](code/postlab/BinarySearchTree.h.html) ([src](code/postlab/BinarySearchTree.h)), [BinarySearchTree.cpp](code/postlab/BinarySearchTree.cpp.html) ([src](code/postlab/BinarySearchTree.cpp)), [AVLNode.h](code/postlab/AVLNode.h.html) ([src](code/postlab/AVLNode.h)), [AVLNode.cpp](code/postlab/AVLNode.cpp.html) ([src](code/postlab/AVLNode.cpp)), [AVLTree.h](code/postlab/AVLNode.h.html), ([src](code/postlab/AVLTree.h)), [AVLTree.cpp](code/postlab/AVLTree.cpp.html) ([src](code/postlab/AVLTree.cpp)), [TreePathTest.cpp](code/postlab/TreePathTest.cpp.html) ([src](code/postlab/TreePathTest.cpp)), [testfile1.txt](code/postlab/testfile1.txt), [testfile2.txt](code/postlab/testfile2.txt), [testfile3.txt](code/postlab/testfile3.txt). These files are contained in the postlab/ directory of the [code.zip](code.zip) file.
 4. Files to submit: AVLTree.h, BinarySearchTree.h, TreePathTest.cpp, Makefile, any other files needed to make your code compile (files such as AVLTree.cpp, BinarySearchTree.cpp, Node.h's and .cpp's, etc...), analysis.pdf (see the post-lab section for formatting details)
 
 ------------------------------------------------------------