added the num_cmps

rhiwatson · rhiwatson · commit f5a5d4a36a90 · 2013-02-15T21:25:01.000-06:00
diff --git a/James_Watson_Derek_Wene_Assignment2.zip b/James_Watson_Derek_Wene_Assignment2.zip
diff --git a/bubble-sort.cpp b/bubble-sort.cpp
@@ -16,10 +16,9 @@ BubbleSort::sort(int A[], int size)			// main entry point
   while(!done)
   {
 	done = true;
-	num_cmps ++;
 	for(int n = 0; n < size ; ++n)
 	{
-		num_cmps++;
+		num_cmps += 2;
 		if(A[n] < A[n-1])
 		{
 			int temp = A[n];
diff --git a/insertion-sort - Copy - Copy.cpp b/insertion-sort - Copy - Copy.cpp
@@ -0,0 +1,64 @@
+//============================================================================
+// Name        : insertion-sort.cpp
+// Author      : 
+// Date        :
+// Copyright   : 
+// Description : Implementation of insertion sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <ostream>
+
+void
+InsertionSort::sort(int A[], int size)				// main entry point
+{
+int j=0;
+int temp=0;
+int num=0;
+        for (int i=1; i<size; ++i) 
+        {
+           temp= A[i];
+           j = i-1;
+		   for(num=0; (j >= 0) && (A[j] > temp); num+=2)
+           {
+               A[j+1] = A[j];
+               j -= 1;
+           }
+            A[j+1]=temp;
+			num_cmps+=num;
+        }
+  }
+
+/*int i=0;
+int j=0;
+int key=0;
+{
+for (j=1; j<size; j++)
+{
+key= array[j];
+for (i=j-1; (i>=0) && (array[i]<key); i++)
+{
+array[i+1]= array[i];
+}
+array[i+1]=key;
+}
+return;
+}
+while(A[i]<A[i-1])
+			{
+			temp=A[i-1];
+			A[i-temp] = A[i];
+			A[i]=temp;
+			}
+			
+			
+  int temp=0;
+  int j = 0;
+	for(int i=1; i<size; ++i)
+	{
+	temp=A[i];
+	for(j=i-1; j>=0 && A[j]<temp; ++j)
+	A[j+1]=A[j];
+	}
+	A[j+1]=temp;			*/
+		
diff --git a/insertion-sort - Copy.cpp b/insertion-sort - Copy.cpp
@@ -0,0 +1,64 @@
+//============================================================================
+// Name        : insertion-sort.cpp
+// Author      : 
+// Date        :
+// Copyright   : 
+// Description : Implementation of insertion sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <ostream>
+
+void
+InsertionSort::sort(int A[], int size)				// main entry point
+{
+int j=0;
+int temp=0;
+int num=0;
+        for (int i=1; i<size; ++i) 
+        {
+           temp= A[i];
+           j = i-1;
+		   for(num=0; (j >= 0) && (A[j] > temp); num+=2)
+           {
+               A[j+1] = A[j];
+               j -= 1;
+           }
+            A[j+1]=temp;
+			num_cmps+=num;
+        }
+  }
+
+/*int i=0;
+int j=0;
+int key=0;
+{
+for (j=1; j<size; j++)
+{
+key= array[j];
+for (i=j-1; (i>=0) && (array[i]<key); i++)
+{
+array[i+1]= array[i];
+}
+array[i+1]=key;
+}
+return;
+}
+while(A[i]<A[i-1])
+			{
+			temp=A[i-1];
+			A[i-temp] = A[i];
+			A[i]=temp;
+			}
+			
+			
+  int temp=0;
+  int j = 0;
+	for(int i=1; i<size; ++i)
+	{
+	temp=A[i];
+	for(j=i-1; j>=0 && A[j]<temp; ++j)
+	A[j+1]=A[j];
+	}
+	A[j+1]=temp;			*/
+		
diff --git a/radix-sort - Copy - Copy.cpp b/radix-sort - Copy - Copy.cpp
@@ -0,0 +1,68 @@
+//============================================================================
+// Name        : radix-sort.cpp
+// Author      : Derek Wene
+// Date        :
+// Copyright   : Sure, lets say its copyrighted.
+// Description : Implementation of radix sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <iostream>
+#include <cmath>
+using namespace std;
+
+void
+RadixSort::sort(int A[], int size)
+{
+int digits=0;
+int x=0;
+for(int i =0; i<size; ++i)//Find largest number
+	{
+		if(A[i]>digits)
+		digits=A[i];
+	}
+digits = floor(log(digits));//find highest digit number
+int B[10];
+int C[size];
+int D[size];
+int power=1;
+
+while(power <= digits)//Get all the digits in the array
+	{
+	for(int n = 0; n < 10; ++n)
+		{
+		B[n] = 0;
+		}
+	for(int j=0; j<size; ++j)//Set digits
+		{
+			D[j] = (A[j]/((int)pow(10.0,power)))%10;
+		}
+		
+	//Counting sort starts here
+	for(int k=0; k<size; ++k)//Set number of each digit.
+		{
+			B[D[k]]++;
+		}
+	int total = 0;
+	for(int l=0; l<10; ++l)//Do the less than equal part.
+		{	
+			int temp = B[l];
+			B[l] = total;
+			total += temp;
+		}
+	for(int m=0; m<size; ++m)//Actual Sorting Here
+		{
+		C[B[D[m]]] = A[m];
+		++B[D[m]];
+		}
+	for(int n=0; n<size; ++n)//reset A with new sorted part
+		{
+			A[n] = C[n];
+			C[n] = 0;
+			D[n] = 0;
+		}
+	
+		++power;
+	}		
+		
+}
diff --git a/radix-sort - Copy.cpp b/radix-sort - Copy.cpp
@@ -0,0 +1,68 @@
+//============================================================================
+// Name        : radix-sort.cpp
+// Author      : Derek Wene
+// Date        :
+// Copyright   : Sure, lets say its copyrighted.
+// Description : Implementation of radix sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <iostream>
+#include <cmath>
+using namespace std;
+
+void
+RadixSort::sort(int A[], int size)
+{
+int digits=0;
+int x=0;
+for(int i =0; i<size; ++i)//Find largest number
+	{
+		if(A[i]>digits)
+		digits=A[i];
+	}
+digits = floor(log(digits));//find highest digit number
+int B[10];
+int C[size];
+int D[size];
+int power=1;
+
+while(power <= digits)//Get all the digits in the array
+	{
+	for(int n = 0; n < 10; ++n)
+		{
+		B[n] = 0;
+		}
+	for(int j=0; j<size; ++j)//Set digits
+		{
+			D[j] = (A[j]/((int)pow(10.0,power)))%10;
+		}
+		
+	//Counting sort starts here
+	for(int k=0; k<size; ++k)//Set number of each digit.
+		{
+			B[D[k]]++;
+		}
+	int total = 0;
+	for(int l=0; l<10; ++l)//Do the less than equal part.
+		{	
+			int temp = B[l];
+			B[l] = total;
+			total += temp;
+		}
+	for(int m=0; m<size; ++m)//Actual Sorting Here
+		{
+		C[B[D[m]]] = A[m];
+		++B[D[m]];
+		}
+	for(int n=0; n<size; ++n)//reset A with new sorted part
+		{
+			A[n] = C[n];
+			C[n] = 0;
+			D[n] = 0;
+		}
+	
+		++power;
+	}		
+		
+}
diff --git a/selection-sort - Copy - Copy.cpp b/selection-sort - Copy - Copy.cpp
@@ -0,0 +1,34 @@
+//============================================================================
+// Name        : selection-sort.cpp
+// Author      : 
+// Date        :
+// Copyright   : 
+// Description : Implementation of selection sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <iostream>
+using namespace std; 
+void
+SelectionSort::sort(int A[], int size)				// main entry point
+{
+	cout << "Selection Sort!" << endl;
+	num_cmps = 0;
+	int min = 0;
+	int temp = 0;
+	for(int n = 0; n < size; ++n)
+	{	
+		num_cmps++;
+		min = n;
+		for(int j = n + 1; j < size; ++j)
+		{
+			num_cmps++;
+			if(A[j] < A[min])
+				min = j;
+		}
+		num_cmps++;
+		temp = A[n];
+		A[n] = A[min];
+		A[min] = temp;
+	}
+}
diff --git a/selection-sort - Copy.cpp b/selection-sort - Copy.cpp
@@ -0,0 +1,34 @@
+//============================================================================
+// Name        : selection-sort.cpp
+// Author      : 
+// Date        :
+// Copyright   : 
+// Description : Implementation of selection sort in C++
+//============================================================================
+
+#include "sort.h"
+#include <iostream>
+using namespace std; 
+void
+SelectionSort::sort(int A[], int size)				// main entry point
+{
+	cout << "Selection Sort!" << endl;
+	num_cmps = 0;
+	int min = 0;
+	int temp = 0;
+	for(int n = 0; n < size; ++n)
+	{	
+		num_cmps++;
+		min = n;
+		for(int j = n + 1; j < size; ++j)
+		{
+			num_cmps++;
+			if(A[j] < A[min])
+				min = j;
+		}
+		num_cmps++;
+		temp = A[n];
+		A[n] = A[min];
+		A[min] = temp;
+	}
+}
diff --git a/selection-sort.cpp b/selection-sort.cpp
@@ -22,7 +22,7 @@ SelectionSort::sort(int A[], int size)				// main entry point
 		min = n;
 		for(int j = n + 1; j < size; ++j)
 		{
-			num_cmps++;
+			num_cmps += 2;
 			if(A[j] < A[min])
 				min = j;
 		}
@@ -31,4 +31,5 @@ SelectionSort::sort(int A[], int size)				// main entry point
 		A[n] = A[min];
 		A[min] = temp;
 	}
+	num_cmps++;
 }
diff --git a/shell-sort.cpp b/shell-sort.cpp
@@ -19,15 +19,21 @@ int temp = 0;
  int step = size/2;
  while(step > 0)
  {
+	++num_cmps;
 	for(int i = step; i < size; ++i)
 	{
+		++num_cmps;
 		for(int j = i; j >= step && A[j] < A[j-step]; j -= step)
 		{
+			num_cmps += 2;
 			temp = A[j];
 			A[j] = A[j-step];
 			A[j - step] = temp;
 		}
+		num_cmps += 2;
 	}
+	++num_cmps;
 	step /= 2;
 }
+++num_cmps;
 }
diff --git a/sort - Copy - Copy.cpp b/sort - Copy - Copy.cpp
diff --git a/sort - Copy.cpp b/sort - Copy.cpp

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,9 @@ BubbleSort::sort(int A[], int size) // main entry point`
`16`	`16`	`while(!done)`
`17`	`17`	`{`
`18`	`18`	`done = true;`
`19`		`- num_cmps ++;`
`20`	`19`	`for(int n = 0; n < size ; ++n)`
`21`	`20`	`{`
`22`		`- num_cmps++;`
	`21`	`+ num_cmps += 2;`
`23`	`22`	`if(A[n] < A[n-1])`
`24`	`23`	`{`
`25`	`24`	`int temp = A[n];`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ SelectionSort::sort(int A[], int size) // main entry point`
`22`	`22`	`min = n;`
`23`	`23`	`for(int j = n + 1; j < size; ++j)`
`24`	`24`	`{`
`25`		`- num_cmps++;`
	`25`	`+ num_cmps += 2;`
`26`	`26`	`if(A[j] < A[min])`
`27`	`27`	`min = j;`
`28`	`28`	`}`
`@@ -31,4 +31,5 @@ SelectionSort::sort(int A[], int size) // main entry point`
`31`	`31`	`A[n] = A[min];`
`32`	`32`	`A[min] = temp;`
`33`	`33`	`}`
	`34`	`+ num_cmps++;`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,21 @@ int temp = 0;`
`19`	`19`	`int step = size/2;`
`20`	`20`	`while(step > 0)`
`21`	`21`	`{`
	`22`	`+ ++num_cmps;`
`22`	`23`	`for(int i = step; i < size; ++i)`
`23`	`24`	`{`
	`25`	`+ ++num_cmps;`
`24`	`26`	`for(int j = i; j >= step && A[j] < A[j-step]; j -= step)`
`25`	`27`	`{`
	`28`	`+ num_cmps += 2;`
`26`	`29`	`temp = A[j];`
`27`	`30`	`A[j] = A[j-step];`
`28`	`31`	`A[j - step] = temp;`
`29`	`32`	`}`
	`33`	`+ num_cmps += 2;`
`30`	`34`	`}`
	`35`	`+ ++num_cmps;`
`31`	`36`	`step /= 2;`
`32`	`37`	`}`
	`38`	`+++num_cmps;`
`33`	`39`	`}`