|
@@ -32,6 +32,7 @@ public class TestAlgo implements AddOn {
|
|
private TextField blackstartStartTimeTextfield;
|
|
private TextField blackstartStartTimeTextfield;
|
|
private TextField simulationDurationTextfield;
|
|
private TextField simulationDurationTextfield;
|
|
private TextField storageStartCharge;
|
|
private TextField storageStartCharge;
|
|
|
|
+ private TextField waitBetweenIterations;
|
|
|
|
|
|
private int blackstartSuccessTime;
|
|
private int blackstartSuccessTime;
|
|
private int blackstartStartTime;
|
|
private int blackstartStartTime;
|
|
@@ -123,6 +124,14 @@ public class TestAlgo implements AddOn {
|
|
storageStartChargeLabel.setBounds(185, 135, 300, 20);
|
|
storageStartChargeLabel.setBounds(185, 135, 300, 20);
|
|
parameterPanel.add(storageStartChargeLabel);
|
|
parameterPanel.add(storageStartChargeLabel);
|
|
|
|
|
|
|
|
+ waitBetweenIterations = new TextField("0");
|
|
|
|
+ waitBetweenIterations.setBounds(10, 205, 170, 20);
|
|
|
|
+ parameterPanel.add(waitBetweenIterations);
|
|
|
|
+
|
|
|
|
+ JLabel waitBetweenIterationsLabel = new JLabel("Wait time between iterations");
|
|
|
|
+ waitBetweenIterationsLabel.setBounds(185, 205, 300, 20);
|
|
|
|
+ parameterPanel.add(waitBetweenIterationsLabel);
|
|
|
|
+
|
|
// JButton selectGroupNodeButton = new JButton("Select GroupNode");
|
|
// JButton selectGroupNodeButton = new JButton("Select GroupNode");
|
|
// selectGroupNodeButton.setEnabled(false);
|
|
// selectGroupNodeButton.setEnabled(false);
|
|
// selectGroupNodeButton.setBounds(10, 25, 165, 20);
|
|
// selectGroupNodeButton.setBounds(10, 25, 165, 20);
|
|
@@ -295,12 +304,12 @@ public class TestAlgo implements AddOn {
|
|
* @param curIteration
|
|
* @param curIteration
|
|
*/
|
|
*/
|
|
private void blackstartMain(int curIteration) {
|
|
private void blackstartMain(int curIteration) {
|
|
-// try {
|
|
|
|
-// Thread.sleep(1000);
|
|
|
|
-// } catch (InterruptedException e) {
|
|
|
|
-// // TODO Auto-generated catch block
|
|
|
|
-// e.printStackTrace();
|
|
|
|
-// }
|
|
|
|
|
|
+ try {
|
|
|
|
+ Thread.sleep(Integer.parseInt(waitBetweenIterations.getText()));
|
|
|
|
+ } catch (InterruptedException e) {
|
|
|
|
+ // TODO Auto-generated catch block
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
control.getModel().setCurIteration(curIteration);
|
|
control.getModel().setCurIteration(curIteration);
|
|
if (blackstartRunning()) {
|
|
if (blackstartRunning()) {
|
|
if (!blackstartAlgo(curIteration)) {
|
|
if (!blackstartAlgo(curIteration)) {
|
|
@@ -340,6 +349,7 @@ public class TestAlgo implements AddOn {
|
|
/**
|
|
/**
|
|
* TODO:HOLEG UNTERVERSORGUNG CHECKEN
|
|
* TODO:HOLEG UNTERVERSORGUNG CHECKEN
|
|
* TODO: storage laden
|
|
* TODO: storage laden
|
|
|
|
+ * TODO: run houses / elements from storage
|
|
*
|
|
*
|
|
* @param curIteration
|
|
* @param curIteration
|
|
* @return true or false depending on whether the blackstart was successful for
|
|
* @return true or false depending on whether the blackstart was successful for
|