Преглед на файлове

added comments for SortTimes1, 2, and 3

Lara Luu преди 10 години
родител
ревизия
d849106cd3
променени са 3 файла, в които са добавени 65 реда и са изтрити 32 реда
  1. 21 10
      Project5/src/SortTimes1.java
  2. 23 12
      Project5/src/SortTimes2.java
  3. 21 10
      Project5/src/SortTimes3.java

+ 21 - 10
Project5/src/SortTimes1.java

@@ -1,3 +1,14 @@
+/**
+ * Prints out sort times on a pre-sorted list
+ * 
+ * Project 5
+ * 
+ * @author Thomas Flucke tflucke
+ * @author Lara Luu ljluu
+ * 
+ * @since 2015/12/01
+ * 
+ */
 public class SortTimes1 {
 
 	public static void main(String[] args)
@@ -14,21 +25,21 @@ public class SortTimes1 {
 				baseListMerge[i] = i;
 				baseListQuick[i] = i;
 			}
-			long start = System.currentTimeMillis();
+			long start = System.currentTimeMillis(); // start time for selection sort
 			Sorts.selectionSort(baseListSelect, N);
-			long selectSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long selectSortTime = System.currentTimeMillis() - start; // stores final sort time
+			start = System.currentTimeMillis(); // start time for bubble sort
 			Sorts.bubbleSort(baseListBubble, N);
-			long bubbleSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long bubbleSortTime = System.currentTimeMillis() - start; // stores final sort time
+			start = System.currentTimeMillis(); // start time for insertion sort
 			Sorts.insertionSort(baseListInsert, N);
-			long insertSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long insertSortTime = System.currentTimeMillis() - start; // stores final sort time
+			start = System.currentTimeMillis(); // start time for merge sort
 			Sorts.mergeSort(baseListMerge, N);
-			long mergeSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long mergeSortTime = System.currentTimeMillis() - start; // stores final sort time
+			start = System.currentTimeMillis(); // start time for quick sort
 			Sorts.quickSort(baseListQuick, N);
-			long quickSortTime = System.currentTimeMillis() - start;
+			long quickSortTime = System.currentTimeMillis() - start; // stores final sort time
 			System.out.println(String.format("N=%d: T_ss=%d, T_bs=%d, T_is=%d, T_ms=%d, T_qs=%d",
 					N, selectSortTime, bubbleSortTime, insertSortTime, mergeSortTime, quickSortTime));
 		}

+ 23 - 12
Project5/src/SortTimes2.java

@@ -1,3 +1,14 @@
+/**
+ * prints out sort times on a reverse-sorted list
+ * 
+ * Project 5
+ * 
+ * @author Thomas Flucke tflucke
+ * @author Lara Luu ljluu
+ * 
+ * @since 2015/12/01
+ * 
+ */
 public class SortTimes2 {
 
 	public static void main(String[] args)
@@ -14,21 +25,21 @@ public class SortTimes2 {
 				baseListMerge[i] = N - i;
 				baseListQuick[i] = N - i;
 			}
-			long start = System.currentTimeMillis();
+			long start = System.currentTimeMillis(); // start time for selection sort
 			Sorts.selectionSort(baseListSelect, N);
-			long selectSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
-			Sorts.bubbleSort(baseListBubble, N);
-			long bubbleSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
-			Sorts.insertionSort(baseListInsert, N);
-			long insertSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long selectSortTime = System.currentTimeMillis() - start; // end time for selection sort
+			start = System.currentTimeMillis(); // start time for bubble sort
+			Sorts.bubbleSort(baseListBubble, N); 
+			long bubbleSortTime = System.currentTimeMillis() - start; // end time for bubble sort
+			start = System.currentTimeMillis(); // start time for insertion sort
+			Sorts.insertionSort(baseListInsert, N); 
+			long insertSortTime = System.currentTimeMillis() - start; // end time for insertion sort
+			start = System.currentTimeMillis(); // start time for mergesort
 			Sorts.mergeSort(baseListMerge, N);
-			long mergeSortTime = System.currentTimeMillis() - start;
-			start = System.currentTimeMillis();
+			long mergeSortTime = System.currentTimeMillis() - start; // end time for mergesort
+			start = System.currentTimeMillis(); // start time for quicksort
 			Sorts.quickSort(baseListQuick, N);
-			long quickSortTime = System.currentTimeMillis() - start;
+			long quickSortTime = System.currentTimeMillis() - start; // end time for quicksort
 			System.out.println(String.format("N=%d: T_ss=%d, T_bs=%d, T_is=%d, T_ms=%d, T_qs=%d",
 					N, selectSortTime, bubbleSortTime, insertSortTime, mergeSortTime, quickSortTime));
 		}

+ 21 - 10
Project5/src/SortTimes3.java

@@ -1,3 +1,14 @@
+/**
+ * Prints out sort times on an unsorted list
+ * 
+ * Project 5
+ * 
+ * @author Thomas Flucke tflucke
+ * @author Lara Luu ljluu
+ * 
+ * @since 2015/12/01
+ * 
+ */
 public class SortTimes3 {
 
 	public static void main(String[] args)
@@ -17,21 +28,21 @@ public class SortTimes3 {
 					baseListMerge[i] = num;
 					baseListQuick[i] = num;
 				}
-				long start = System.currentTimeMillis();
+				long start = System.currentTimeMillis(); // start time for selection sort
 				Sorts.selectionSort(baseListSelect, N);
-				long selectSortTime = System.currentTimeMillis() - start;
-				start = System.currentTimeMillis();
+				long selectSortTime = System.currentTimeMillis() - start; // end time for selection sort
+				start = System.currentTimeMillis(); // start time for bubble sort
 				Sorts.bubbleSort(baseListBubble, N);
-				long bubbleSortTime = System.currentTimeMillis() - start;
-				start = System.currentTimeMillis();
+				long bubbleSortTime = System.currentTimeMillis() - start; // end time for bubble sort
+				start = System.currentTimeMillis(); // start time for insertion sort
 				Sorts.insertionSort(baseListInsert, N);
-				long insertSortTime = System.currentTimeMillis() - start;
-				start = System.currentTimeMillis();
+				long insertSortTime = System.currentTimeMillis() - start; // end time for insertion sort
+				start = System.currentTimeMillis(); // start time for merge sort
 				Sorts.mergeSort(baseListMerge, N);
-				long mergeSortTime = System.currentTimeMillis() - start;
-				start = System.currentTimeMillis();
+				long mergeSortTime = System.currentTimeMillis() - start; // end time for merge sort
+				start = System.currentTimeMillis(); // start time for quick sort
 				Sorts.quickSort(baseListQuick, N);
-				long quickSortTime = System.currentTimeMillis() - start;
+				long quickSortTime = System.currentTimeMillis() - start; // end time for quick sort
 				System.out.println(String.format("N=%d: T_ss=%d, T_bs=%d, T_is=%d, T_ms=%d, T_qs=%d",
 						N, selectSortTime, bubbleSortTime, insertSortTime, mergeSortTime, quickSortTime));
 			}