Commit 2

LinkedList.cpp

@@ -164,6 +164,33 @@ void LinkedList::remove(const valueType removeString)
 	
 }
 
+void LinkedList::sort()
+{	
+	Node* n2;			//The node after the starting Node
+	valueType nSwap;
+
+	bool swapFlag;	//flag for if a swap happend this loop
+	
+	do
+	{
+		swapFlag=0;
+		for (Node* n1=head; n1->getNext()!=NULL; n1=n1->getNext())
+		{
+			//Name the next node for readability 
+			n2 = n1->getNext();
+			
+			if(n1->getData() > n2->getData())
+			{
+				//std::cout<<"SWAP"<<std::endl;
+				
+				nSwap=n2->getData();
+				n2->setData(n1->getData());
+				n1->setData(nSwap);
+				swapFlag = 1;
+			}
+		}
+	} while (swapFlag == 1);
+}
 
 //Queries
 LinkedList::valueType LinkedList::getNodeData(int wordNum) const
@@ -260,52 +287,4 @@ void LinkedList::operator += (LinkedList& list2)
 	{
 		addToTail(list2.getNodeData(i));
 	}
-	
-	//Test
-	//removeWord("was");
-	//std::cout<<std::endl<<"TEST: "<<buildString()<<std::endl;
-
-}
-
-void LinkedList::sort()
-{
-	Node* temp=head;
-	Node* nextTemp;
-	bool swapped = 0;
-
-	do{
-		
-		nextTemp=temp->getNext();
-		
-		if (temp<nextTemp)
-			std::cout<<"SWAP";
-		
-		/*
-		if (temp->getData()<nextTemp->getData())
-		{
-			nextTemp = temp->getNext();
-			temp->setNext(nextTemp->getNext());
-			nextTemp->setNext(temp);
-			
-			nextTemp->setPrev(temp->getPrev());
-			temp->setPrev(nextTemp);
-		}
-			*/
-		/*
-			nextTemp->setPrev(temp->getPrev());
-			temp->setNext(nextTemp->getNext());
-			
-			temp->setPrev(nextTemp);
-			nextTemp->setNext(temp);	
-		*/
-			
-			
-		std::cout<<(temp)<<": "<<temp->getData()<<": "<<swapped<<std::endl;
-		temp = temp->getNext();
-		
-		swapped=0;
-		
-		}while(temp->getNext()!=NULL);
-
-	std::cout<<std::endl;
 }

LinkedListDemo.cpp

@@ -66,8 +66,9 @@ int main()
 //	cout << "List 2: " << secondList << endl << endl;
 
 	cout << "Sorting list 1:" << endl;
+	cout << "List 1   : "<<firstList << endl;
 	firstList.sort();
-	cout << firstList << endl << endl;
+	cout << "List Sort: "<<firstList << endl << endl;
 
 	cout << "The program has finished." << endl;
 	return 0;

a1.exe.stackdump

@@ -1,17 +1,17 @@
 Exception: STATUS_ACCESS_VIOLATION at rip=003FCCD3A85
-rax=0000000000000000 rbx=000000018023A780 rcx=00000000FFFFCB30
+rax=0000000000000000 rbx=00000003FCD5DFC0 rcx=00000000FFFFCB28
 rdx=0000000000000000 rsi=0000000000000000 rdi=0000000000000000
-r8 =00000000FFFFCB1C r9 =0000000000000000 r10=0000000100000000
+r8 =00000000FFFFC96C r9 =0000000000000000 r10=0000000100000000
-r11=00000003FCCCF7A3 r12=00000000FFFFCC90 r13=00000000FFFFCDF0
+r11=00000003FCD4B163 r12=00000000FFFFCC90 r13=00000000FFFFCDF0
 r14=0000000000000000 r15=0000000000000000
-rbp=00000000FFFFCAF0 rsp=00000000FFFFCA90
+rbp=00000000FFFFCAD0 rsp=00000000FFFFCA70
-program=D:\OneDrive\Zach\University\2020\Semester 2\SENG1120\Assignment 1\a1.exe, pid 7913, thread main
+program=D:\OneDrive\Zach\University\2020\Semester 2\SENG1120\Assignment 1\a1.exe, pid 1976, thread main
 cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
 Stack trace:
 Frame        Function    Args
-000FFFFCAF0  003FCCD3A85 (0018023AD70, 000FFFFD680, 001801AE889, 0018023A780)
+000FFFFCAD0  003FCCD3A85 (0018013E96B, 000FFFFCB60, 000FFFFCC90, 003FCD5DFC0)
-000FFFFCAF0  00100402855 (00000000000, 0018023A780, 0018023A780, 003FCD5DFC0)
+000FFFFCAD0  001004029B5 (00000000000, 00000000000, 00000000000, 000FFFFCC01)
-000FFFFCB90  00100402517 (000FFFFCC20, 00000000001, 001801F6BC0, 00800000440)
+000FFFFCB60  001004021B8 (000FFFFCC20, 00000000001, 001801F6BC0, 00800000440)
 000FFFFCC00  001004016AF (0018004AEC1, 00180049D60, 00000000000, 00180325BE0)
 000FFFFCCE0  0018004AF2D (00000000000, 00000000000, 00000000000, 00000000000)
 000FFFFFFF0  00180048886 (00000000000, 00000000000, 00000000000, 00000000000)