Update sort-an-array.cpp

kamyu104 · web-flow · commit 4966dc8b77dd · 2019-04-22T04:34:00.000+08:00
diff --git a/C++/sort-an-array.cpp b/C++/sort-an-array.cpp
@@ -17,13 +17,12 @@ class Solution {
         const auto& mid = start + (end - start) / 2;
         mergeSort(start, mid, nums);
         mergeSort(mid, end, nums);
-        int r = mid;
         vector<int> tmp;
-        for (int i = start; i < mid; ++i) {
-            while (r < end && (*nums)[r] < (*nums)[i]) {
-                tmp.emplace_back((*nums)[r++]);
+        for (int left = start, right = mid; left < mid; ++left) {
+            while (right < end && (*nums)[right] < (*nums)[left]) {
+                tmp.emplace_back((*nums)[right++]);
             }
-            tmp.emplace_back((*nums)[i]);
+            tmp.emplace_back((*nums)[left]);
         }
         copy(tmp.cbegin(), tmp.cend(), nums->begin() + start);
     }

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,12 @@ class Solution {`
`17`	`17`	`const auto& mid = start + (end - start) / 2;`
`18`	`18`	`mergeSort(start, mid, nums);`
`19`	`19`	`mergeSort(mid, end, nums);`
`20`		`- int r = mid;`
`21`	`20`	`vector<int> tmp;`
`22`		`- for (int i = start; i < mid; ++i) {`
`23`		`- while (r < end && (nums)[r] < (nums)[i]) {`
`24`		`- tmp.emplace_back((*nums)[r++]);`
	`21`	`+ for (int left = start, right = mid; left < mid; ++left) {`
	`22`	`+ while (right < end && (nums)[right] < (nums)[left]) {`
	`23`	`+ tmp.emplace_back((*nums)[right++]);`
`25`	`24`	`}`
`26`		`- tmp.emplace_back((*nums)[i]);`
	`25`	`+ tmp.emplace_back((*nums)[left]);`
`27`	`26`	`}`
`28`	`27`	`copy(tmp.cbegin(), tmp.cend(), nums->begin() + start);`
`29`	`28`	`}`