Browse Source

Algorithm fix - only run once per Iteration

Kevin Trometer 7 years ago
parent
commit
7d27a9015f
2 changed files with 3 additions and 6 deletions
  1. 0 6
      src/ui/controller/Control.java
  2. 3 0
      src/ui/view/GUI.java

+ 0 - 6
src/ui/controller/Control.java

@@ -500,9 +500,6 @@ public class Control {
 	public void calculateStateForCurrentTimeStep() {
 		simulationManager.reset();
 		simulationManager.calculateStateForTimeStep(model.getCurIteration());
-		if (model.getIsSimulation()) {
-			runAlgorithm(model, this);
-		}
 	}
 
 	/**
@@ -514,9 +511,6 @@ public class Control {
 	public void calculateStateForTimeStep(int x) {
 		simulationManager.reset();
 		simulationManager.calculateStateForTimeStep(x);
-		if (model.getIsSimulation()) {
-			runAlgorithm(model, this);
-		}
 	}
 
 	/**

+ 3 - 0
src/ui/view/GUI.java

@@ -1615,6 +1615,9 @@ public class GUI<E> implements CategoryListener {
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				int i = model.getCurIteration();
+				if (model.getIsSimulation()) {
+					controller.runAlgorithm(model, controller);
+				}
 				controller.calculateStateForTimeStep(i);
 				contentPane.updateUI();
 				unitGraph.repaint();