Merge pull request algorithm-visualizer#32 from parkjs814/revert-30-fix/sorting

64json · 64json · commit 448eaf7595a6 · 2016-05-23T14:57:34.000-05:00
Revert "Sorting time complexity"
diff --git a/algorithm/sorting/bubble/basic/code.js b/algorithm/sorting/bubble/basic/code.js
@@ -7,13 +7,13 @@ do {
     swapped = false;
     tracer._select(N - 1);
     for (var i = 1; i < N; i++) {
-        tracer._notify(i - 1, i);
         if (D[i - 1] > D[i]) {
             tracer._print('swap ' + D[i - 1] + ' and ' + D[i]);
             var temp = D[i - 1];
             D[i - 1] = D[i];
             D[i] = temp;
             swapped = true;
+            tracer._notify(i - 1, i);
         }
     }
     tracer._deselect(N - 1);
diff --git a/algorithm/sorting/quick/basic/code.js b/algorithm/sorting/quick/basic/code.js
@@ -17,11 +17,11 @@ function partition(low, high) {
     var temp;
     
     for (var j = low; j < high; j++) {
-        tracer._notify(i, j);
         if (D[j] <= pivot) {
             temp = D[i];
             D[i] = D[j];
             D[j] = temp;
+            tracer._notify(i, j);
             i++;
         }
     }
diff --git a/algorithm/sorting/selection/basic/code.js b/algorithm/sorting/selection/basic/code.js
@@ -5,9 +5,11 @@ for (var i = 0; i < D.length - 1; i++) {
     var minJ = i;
     tracer._select(i);
     for (var j = i + 1; j < D.length; j++) {
-        tracer._select(j);
-        if (D[j] < D[minJ]) minJ = j;
-        tracer._deselect(j);
+        if (D[j] < D[minJ]) {
+            tracer._select(j);
+            minJ = j;
+            tracer._deselect(j);
+        }
     }
     if (minJ != i) {
         tracer._print('swap ' + D[i] + ' and ' + D[minJ]);

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ function partition(low, high) {`
`17`	`17`	`var temp;`
`18`	`18`
`19`	`19`	`for (var j = low; j < high; j++) {`
`20`		`- tracer._notify(i, j);`
`21`	`20`	`if (D[j] <= pivot) {`
`22`	`21`	`temp = D[i];`
`23`	`22`	`D[i] = D[j];`
`24`	`23`	`D[j] = temp;`
	`24`	`+ tracer._notify(i, j);`
`25`	`25`	`i++;`
`26`	`26`	`}`
`27`	`27`	`}`