Diff: main.cpp

Revision:

8:78b057dd6da4

Parent:

6:421ece74143e

Child:

9:3c1acc87b80c

--- a/main.cpp	Tue May 01 16:13:47 2018 +0000
+++ b/main.cpp	Tue May 01 16:42:40 2018 +0000
@@ -22,64 +22,71 @@
     //Feel free to add words, just update the array size
     string wordlist[20] = {"Dog","Cat","Car","Tree","Star","Radio","Tea","Book","Hello","Bank","Bird","Bus","Red","Green","Blue","Coat","Dress","Shirt","Egg","Pear"};
     
-    //Can I put these ^v in the header? I really can't remember
     
     //Creation of the binary search tree//
     //I need to insert 2,8,9,0,+//
-    Tree * newRoot;
-    newRoot->insertdot('e', newRoot);
-    Tree * eNode = newRoot->dot;
-    eNode->insertdash('a', eNode);
-    eNode->insertdot('i', eNode);
-    Tree * iNode = eNode->dot;
-    iNode->insertdash('u',iNode);
-    iNode->insertdot('s',iNode);
-    Tree * sNode = iNode->dot;
-    sNode->insertdash('v',sNode);
-    sNode->insertdot('h',sNode);
-    Tree * hNode = sNode->dot;
-    hNode->insertdash('4',hNode);
-    hNode->insertdot('5',hNode);
-    Tree * vNode = sNode->dash;
-    vNode->insertdash('3',vNode);
-    Tree * uNode = iNode->dash;
-    uNode->insertdot('f',uNode);
-    Tree * aNode = eNode->dash;
-    aNode->insertdot('r',aNode);
-    aNode->insertdash('w',aNode);
-    Tree * rNode = aNode->dot;
-    rNode->insertdot('l',rNode);
-    Tree * wNode = aNode->dash;
-    wNode->insertdot('p',wNode);
-    wNode->insertdash('j',wNode);
-    Tree * jNode = wNode->dash;
-    jNode->insertdash('1',jNode);
-    newRoot->insertdash('t',newRoot);
-    Tree * tNode = newRoot->dash;
-    tNode->insertdot('n',tNode);
-    tNode->insertdash('m',tNode);
-    Tree * nNode = tNode->dash;
-    nNode->insertdot('d',nNode);
-    nNode->insertdash('k',nNode);
-    Tree * dNode = nNode->dot;
-    dNode->insertdot('b',dNode);
-    dNode->insertdash('x',dNode);
-    Tree * bNode = dNode->dot;
-    bNode->insertdot('6',bNode);
-    bNode->insertdash('=',bNode);
-    Tree * xNode = dNode->dash;
-    xNode->insertdot('/',xNode);
-    Tree * kNode = nNode->dash;
-    kNode->insertdot('c',kNode);
-    kNode->insertdash('y',kNode);
-    Tree * mNode = tNode->dash;
-    mNode->insertdot('g',mNode);
-    mNode->insertdash('o',mNode);
-    Tree * gNode = mNode->dot;
-    gNode->insertdot('z',gNode);
-    gNode->insertdash('q',gNode);
-    Tree * zNode = gNode->dot;
-    zNode->insertdot('7',zNode);
+    node * newRoot = new node;
+    insertdot('e', newRoot);
+    node * eNode = newRoot->dot;
+    insertdash('a', eNode);
+    insertdot('i', eNode);
+    cout << returnvalue(eNode->dash) <<endl;
+    node * iNode = eNode->dot;
+    insertdash('u',iNode);
+    insertdot('s',iNode);
+    node *  sNode = iNode->dot;
+    insertdash('v',sNode);
+    insertdot('h',sNode);
+    node * hNode = sNode->dot;
+    insertdash('4',hNode);
+    insertdot('5',hNode);
+    node * vNode = sNode->dash;
+    insertdash('3',vNode);
+    node * uNode = iNode->dash;
+    insertdot('f',uNode);
+    node * aNode = eNode->dash;
+    insertdot('r',aNode);
+    insertdash('w',aNode);
+    node * rNode = aNode->dot;
+    insertdot('l',rNode);
+    node * wNode = aNode->dash;
+    insertdot('p',wNode);
+    insertdash('j',wNode);
+    node * jNode = wNode->dash;
+    insertdash('1',jNode);
+    insertdash('t',newRoot);
+    node * tNode = newRoot->dash;
+    insertdot('n',tNode);
+    insertdash('m',tNode);
+    node * nNode = tNode->dash;
+    insertdot('d',nNode);
+    insertdash('k',nNode);
+    node * dNode = nNode->dot;
+    insertdot('b',dNode);
+    insertdash('x',dNode);
+    node * bNode = dNode->dot;
+    insertdot('6',bNode);
+    insertdash('=',bNode);
+    node * xNode = dNode->dash;
+    insertdot('/',xNode);
+    node * kNode = nNode->dash;
+    insertdot('c',kNode);
+    insertdash('y',kNode);
+    node * mNode = tNode->dash;
+    insertdot('g',mNode);
+    insertdash('o',mNode);
+    node * gNode = mNode->dot;
+    insertdot('z',gNode);
+    insertdash('q',gNode);
+    node * zNode = gNode->dot;
+    insertdot('7',zNode);
+    
+    //Syntax for traversing the tree
+    /*node * newNode = new node;
+    newNode = newRoot;
+    
+    *newNode = traverseDot(newNode);
+    cout << returnvalue(newNode) << " return new node" << endl;*/
     
     string newString = "YYZ";