Final

Author: djrobotfreak

221-12c-A2-code/Makefile final/Makefile

@@ -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)
+	for(int n = 1; n < size ; ++n)
 	{
-		num_cmps++;
+		num_cmps += 2;
 		if(A[n] < A[n-1])
 		{
 			int temp = A[n];

221-12c-A2-code/bubble-sort.cpp final/bubble-sort.cpp

@@ -15,17 +15,19 @@ InsertionSort::sort(int A[], int size)				// main entry point
 int j=0;
 int temp=0;
 int num=0;
+num_cmps++;
         for (int i=1; i<size; ++i) 
         {
            temp= A[i];
            j = i-1;
+		   num_cmps+=3;
 		   for(num=0; (j >= 0) && (A[j] > temp); num+=2)
            {
                A[j+1] = A[j];
                j -= 1;
+			   num_cmps+=2;
            }
             A[j+1]=temp;
-			num_cmps+=num;
         }
   }
 

221-12c-A2-code/generator.cpp final/generator.cpp

@@ -8,7 +8,8 @@
 
 #include "sort.h"
 #include <iostream>
-
+#include <cmath>
+#include <ostream>
 void
 RadixSort::sort(int A[], int size)
 {
@@ -18,38 +19,55 @@ for(int i =0; i<size; ++i)//Find largest number
 	{
 		if(A[i]>digits)
 		digits=A[i];
+
 	}
 digits=log10(digits);//find highest digit number
+			std::cout<<"Largest digit found\n";
 int B[10];
 int C[size];
 int D[size];
-pow=1;
-while(true)//Get all the digits in the array
+int pow=1;
+int temp=0;
+
+while(log10(pow)<7)//Get all the digits in the array
 	{
+	for(int a=0; a<size; a++)
+{
+C[a]=0;
+D[a]=0;
+}
+for(int b=0; b<10; b++)
+{
+B[b]=0;
+}
 	for(int j=0; j<size; ++j)//Set digits
 		{
 			D[j]=(A[j]/(pow))%10;
 		}
-		
 	//Counting sort starts here
 	for(int k=0; k<size; ++k)//Set number of each digit.
 		{
-			B[D[k]]++;
+			++B[D[k]];
 		}
+		if (B[0]==size)
+		{
+		return;}	
 	for(int l=1; l<10; ++l)//Do the less than equal part.
 		{	
-			B[l]=B[l]+B[l-1];
+		B[l]=B[l]+B[l-1];
 		}
+		int fix=size-1;
 	for(int m=size-1; m>=0; --m)//Actual Sorting Here
 		{
 		C[B[D[m]]-1]=A[m];
 		--B[D[m]];
 		}
+
 	for(int n=0; n<size; ++n)//reset A with new sorted part
 		{
 			A[n]=C[n];
 		}
-		if(digits=pow/10)//Detects if done with digits
+		if(digits==pow)//Detects if done with digits
 			break;
 		pow*=10;
 	}		

221-12c-A2-code/insertion-sort.cpp final/insertion-sort.cpp

@@ -8,20 +8,21 @@
 
 #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 = 1; n < size; ++n)
+	for(int n = 0; n < size; ++n)
 	{	
 		num_cmps++;
-		min = n-1;
-		for(int j = n; j < size; ++n)
+		min = n;
+		for(int j = n + 1; j < size; ++j)
 		{
-			num_cmps++;
+			num_cmps += 2;
 			if(A[j] < A[min])
 				min = j;
 		}
@@ -30,4 +31,5 @@ SelectionSort::sort(int A[], int size)				// main entry point
 		A[n] = A[min];
 		A[min] = temp;
 	}
+	num_cmps++;
 }

221-12c-A2-code/option.cpp final/option.cpp

@@ -8,24 +8,32 @@
 
 #include "sort.h"
 #include <iostream>
+using namespace std;
 
 void
 ShellSort::sort(int A[], int size)
 {
+cout << "shell sort!" << endl;
 int temp = 0;
  num_cmps = 0;
  int step = size/2;
  while(step > 0)
  {
+	++num_cmps;
 	for(int i = step; i < size; ++i)
 	{
-		temp = A[i];
-		for(int j = i; j >= step && A[j-step]; j -= step)
+		++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;
 }

221-12c-A2-code/option.h final/option.h

@@ -103,6 +103,7 @@ int main(int argc, char** argv)
    }  
 
    /* read number of integers */
+   cout << "Enter Size >>>";
    int size; //number of integers  
    if (!(cin >> size)) return 1; //exit abnormally
 

221-12c-A2-code/radix-sort.cpp final/radix-sort.cpp

@@ -11,7 +11,7 @@
 
 class Sort {
 protected:
-   int num_cmps; // number of comparisons performed in sort function
+   long int num_cmps; // number of comparisons performed in sort function
 public:
    virtual void sort(int A[], int size) = 0;    // main entry point
    bool testIfSorted(int A[], int size);        // returns false if not sorted