Skip to content

Commit 32c39df

Browse files
committed
update 1.10
1 parent beb0770 commit 32c39df

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

script.js

+28-10
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ async function BubbleSort() {
125125
// QuickSort
126126

127127
async function Partition(start,end) {
128+
129+
for (i = start; i < end; i++) {
130+
myCollection[i].style.background = "cyan";
131+
myCollection[i].style.color = "cyan";
132+
}
133+
128134
var pivot = removePx(myCollection[end].style.height);
129135
var partitionIndex = start;
130136

@@ -142,16 +148,26 @@ async function Partition(start,end) {
142148
partitionIndex++;
143149
}
144150
}
145-
await Swap(partitionIndex, end);
151+
await Swap(partitionIndex, end);
152+
153+
for (i = start; i < end; i++) {
154+
myCollection[i].style.background = "bisque";
155+
myCollection[i].style.color = "bisque";
156+
}
157+
146158
return partitionIndex;
147159
}
148160

149161
async function QuickSort(start,end) {
162+
163+
150164
if (start < end) {
165+
isSorted = 1;
151166
var partitionIndex = await Partition(start, end);
152167
await QuickSort(start, partitionIndex - 1);
153-
await QuickSort(partitionIndex + 1, end);
154-
}
168+
await QuickSort(partitionIndex + 1, end);
169+
}
170+
155171
}
156172

157173
function doQuickSort() {
@@ -163,7 +179,7 @@ function doQuickSort() {
163179
// MergeSort
164180

165181
async function merge(l, m, r) {
166-
await sleep(200);
182+
await sleep(100);
167183
// Find sizes of two subarrays to be merged
168184
var n1 = m - l + 1;
169185
var n2 = r - m;
@@ -219,24 +235,26 @@ async function merge(l, m, r) {
219235
while (j < n2) {
220236
myCollection[k].style.height = addPx(rightArray[j]);
221237
j++;
222-
k++;
223-
224-
}
225-
238+
k++;
239+
}
226240

227241
}
228242

229243
async function MergeSort(l, r) {
230244
await sleep(50);
231245
if (l < r) {
232-
myCollection[l].style.background = "red";
246+
myCollection[l].style.background = "red";
247+
myCollection[l].style.color = "red";
233248
var m = Math.floor((l + r) / 2);
234249
await MergeSort(l, m);
235250
await MergeSort(m + 1, r);
236251
myCollection[r].style.background = "green";
252+
myCollection[r].style.color = "green";
237253
await merge(l, m, r);
238254
myCollection[l].style.background = "cyan";
239-
myCollection[r].style.background = "cyan";
255+
myCollection[l].style.color = "cyan";
256+
myCollection[r].style.background = "cyan";
257+
myCollection[r].style.color = "cyan";
240258
}
241259
}
242260

0 commit comments

Comments
 (0)