performance label working again

Author: dlarocque

src/com/example/algorithmvisualizer/AlgVisualizer.java

@@ -35,6 +35,7 @@ public class AlgVisualizer implements ActionListener, ChangeListener {
 	private int n;
 	private int numSwaps;
 	private int delay;
+	private long totalDelay;
 	private Integer indexComparisons;
 	private long startTime; // start time of a sort
 	private long endTime; // end time of a sort
@@ -280,6 +281,7 @@ public void resetTime() {
 		endTime = 0;
 		visualizationTime = 0;
 		sortingTime = 0;
+		totalDelay = 0;
 	}
 
 	public Integer[] shuffleArr(Integer[] arr) {
@@ -310,13 +312,16 @@ public Integer[] fillArr(Integer[] arr) {
 	 */
 	public void updatePerformance() {
 		numSwaps = arrDisplay.getSwappedIndexes().size();
-
+		System.out.println("total delay " + totalDelay);
 		if (!getSort().equals("Not Sorting") && arrDisplay.getNumChunks() == 1) {
 			visualizationTime = System.currentTimeMillis() - startTime;
-			sortingTime = visualizationTime - (delay * (arrDisplay.getNumChunks() - 1));
+			sortingTime = visualizationTime - totalDelay;
 		} else if (arrDisplay.getNumChunks() > 1) {
 			visualizationTime = System.currentTimeMillis() - startTime;
-			sortingTime = sortingTime + (System.currentTimeMillis() - sortingTime);
+			sortingTime = visualizationTime - totalDelay;
+		}
+		if(stopSort) {
+			resetTime();
 		}
 
 		String performance = String.format(
@@ -475,4 +480,12 @@ public JSlider getFPSslider() {
 	public void setFPSslider(JSlider fPSslider) {
 		FPSslider = fPSslider;
 	}
+
+	public long getTotalDelay() {
+		return totalDelay;
+	}
+
+	public void setTotalDelay(long totalDelay) {
+		this.totalDelay = totalDelay;
+	}
 }

src/com/example/algorithmvisualizer/ArrSorting.java

@@ -101,6 +101,8 @@ protected void process(List<Integer[]> chunks) {
 	private void sleep() {
 		try {
 			Thread.sleep(algVisualizer.getDelay());
+			if (!algVisualizer.stopSort())
+				algVisualizer.setTotalDelay(algVisualizer.getTotalDelay() + algVisualizer.getDelay());
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}