Skip to content

Commit 8fe724b

Browse files
committed
changes in updatePerformance
1 parent 370db08 commit 8fe724b

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

src/com/example/algorithmvisualizer/AlgVisualizer.java

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,29 @@ public Integer[] fillArr(Integer[] arr) {
179179
*/
180180
public void updatePerformance() {
181181
numSwaps = frame.getArrDisplay().getSwappedIndexes().size();
182-
183-
// updates the sorting times based on whether or not we are currently visualizing a sort
184-
if (!getSort().equals("Not Sorting") && frame.getArrDisplay().getNumChunks() == 0) {
182+
183+
if (stopSort) {
184+
resetTime();
185+
} else {
186+
187+
// updates the sorting times based on whether or not we are currently visualizing a sort
188+
//if (!getSort().equals("Not Sorting") && frame.getArrDisplay().getNumChunks() == 0) {
185189

186-
visualizationTime = System.currentTimeMillis() - startTime;
187-
sortingTime = visualizationTime - totalDelay;
190+
// visualizationTime = System.currentTimeMillis() - startTime;
191+
// sortingTime = visualizationTime - totalDelay;
188192

189-
} else if (frame.getArrDisplay().getNumChunks() > 1 && !frame.getArrDisplay().isComplete()) {
193+
//} else if (frame.getArrDisplay().getNumChunks() > 1 && !frame.getArrDisplay().isComplete()) {
190194

191-
visualizationTime = System.currentTimeMillis() - startTime;
192-
sortingTime = visualizationTime - totalDelay; // visualizationTime < totalDelay makes negative time
195+
// visualizationTime = System.currentTimeMillis() - startTime;
196+
// sortingTime = visualizationTime - totalDelay; // visualizationTime < totalDelay makes negative time
193197

198+
//}
199+
if(!frame.getArrDisplay().isComplete() && !getSort().equals("Not Sorting") && (frame.getArrDisplay().getNumChunks() == 0 || frame.getArrDisplay().getNumChunks() > 1)) {
200+
visualizationTime = System.currentTimeMillis() - startTime;
201+
sortingTime = visualizationTime - totalDelay; // why does totalDelay become > visulizationTime?
202+
}
194203
}
195204

196-
if (stopSort) {
197-
resetTime();
198-
}
199-
200205
String performance = String.format(
201206
"Index Comparisons : %d Index Swaps : %d Visualization Time : %dms Sorting Time : %dms",
202207
indexComparisons, numSwaps, visualizationTime, sortingTime);

0 commit comments

Comments
 (0)