Skip to content

Commit bdf8360

Browse files
committed
Solved #34
1 parent bfed63a commit bdf8360

File tree

2 files changed

+4
-33
lines changed

2 files changed

+4
-33
lines changed

src/com/example/algorithmvisualizer/AlgVisualizer.java

+2-27
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class AlgVisualizer implements ActionListener, ChangeListener {
2727
private int n;
2828
private int numSwaps;
2929
private int delay;
30-
private long totalDelay;
3130
private Integer indexComparisons;
3231
private long startTime; // start time of a sort
3332
private long visualizationTime;
@@ -139,7 +138,6 @@ public void resetTime() {
139138
startTime = 0;
140139
visualizationTime = 0;
141140
sortingTime = 0;
142-
totalDelay = 0;
143141
}
144142

145143
public Integer[] initArr() {
@@ -183,29 +181,14 @@ public void updatePerformance() {
183181
if (stopSort) {
184182
resetTime();
185183
} 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) {
189-
190-
// visualizationTime = System.currentTimeMillis() - startTime;
191-
// sortingTime = visualizationTime - totalDelay;
192-
193-
//} else if (frame.getArrDisplay().getNumChunks() > 1 && !frame.getArrDisplay().isComplete()) {
194-
195-
// visualizationTime = System.currentTimeMillis() - startTime;
196-
// sortingTime = visualizationTime - totalDelay; // visualizationTime < totalDelay makes negative time
197-
198-
//}
199184
if(!frame.getArrDisplay().isComplete() && !getSort().equals("Not Sorting") && (frame.getArrDisplay().getNumChunks() == 0 || frame.getArrDisplay().getNumChunks() > 1)) {
200185
visualizationTime = System.currentTimeMillis() - startTime;
201-
System.out.println("visualizationTime " + visualizationTime + " totalDelay " + totalDelay);
202-
sortingTime = visualizationTime - totalDelay; // why does totalDelay become > visulizationTime?
203186
}
204187
}
205188

206189
String performance = String.format(
207-
"Index Comparisons : %d Index Swaps : %d Visualization Time : %dms Sorting Time : %dms",
208-
indexComparisons, numSwaps, visualizationTime, sortingTime);
190+
"Index Comparisons : %d Index Swaps : %d Visualization Time : %dms",
191+
indexComparisons, numSwaps, visualizationTime);
209192
frame.getPerformanceLabel().setText(performance);
210193
frame.pack();
211194
}
@@ -319,14 +302,6 @@ public void setDelay(int delay) {
319302
this.delay = delay;
320303
}
321304

322-
public long getTotalDelay() {
323-
return totalDelay;
324-
}
325-
326-
public void setTotalDelay(long totalDelay) {
327-
this.totalDelay = totalDelay;
328-
}
329-
330305
public String[] getSizeOptions() {
331306
return sizeOptions;
332307
}

src/com/example/algorithmvisualizer/ArrSorting.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,13 @@ protected void process(List<Integer[]> chunks) {
102102
private void sleep() {
103103
try {
104104

105-
if (!algVisualizer.stopSort()) {
106-
algVisualizer.setTotalDelay(algVisualizer.getTotalDelay() + algVisualizer.getDelay());
107-
}
108-
109105
Thread.sleep(algVisualizer.getDelay());
110106

111-
} catch (InterruptedException e) {
107+
} catch (InterruptedException e) {
112108

113109
e.printStackTrace();
114110

115-
}
111+
}
116112
}
117113

118114
/*

0 commit comments

Comments
 (0)