test calculations

src/blackstart/controlAlgorithm.java

@@ -263,18 +263,6 @@ public class controlAlgorithm implements AddOn {
 			setPowerplantProduction(0);
 			enableAllConsumers();
 			SPC.disableStorageDischarging(-1); //disable all storage production
-
-//			StorageElement ele = new StorageElement("Storage", 1, 0, control.getModel());
-//			ele.setStatusAndSetEnergy(Mode.EMIT, 5000);
-//			
-//			System.out.println(""+ele.getEnergyPerElement());
-//			powerPlant.addElement(ele);
-			
-//			for (HolonElement elem : powerPlant.getElements()) {
-//				if(elem instanceof StorageElement) {
-//					println("boom");
-//				}
-//			}
 			// TODO: prios?
 			/////////
 
@@ -397,7 +385,7 @@ public class controlAlgorithm implements AddOn {
 		return storageElements;
 	}
 
-		private void disableConsumers() {
+	private void disableConsumers() {
 		// TODO: disableBatteryLoading? will ich das wirklich?
 		// SPC.disableStorageProduction();
 

src/blackstart/testCalc.java

@@ -0,0 +1,107 @@
+package blackstart;
+
+public class testCalc {
+    double y11;
+    double y22;
+    double y33;
+    double y44;
+    double y55;
+
+    double y12;
+    double y15;
+
+    double y21;
+    double y23;
+    double y24;
+
+    double y32;
+
+    double y42;
+
+    double y51;
+
+    double s1;
+    double s2;
+    double s3;
+    double s4;
+    double s5;
+
+    double u1;
+    double u2;
+    double u3;
+    double u4;
+    double u5;
+
+    public testCalc(double u1, double u2, double u3, double u4, double u5, double s1, double s2, double s3, double s4, double s5){
+        this.u1 = u1;
+        this.u2 = u2;
+        this.u3 = u3;
+        this.u4 = u4;
+        this.u5 = u5;
+        this.s1 = s1;
+        this.s2 = s2;
+        this.s3 = s3;
+        this.s4 = s4;
+        this.s5 = s5;
+
+    }
+
+    private void init(){
+
+        y12 = 1/4.43;
+        y15 = 1/11.075;
+        y23 = 1/3.544;
+        y24 = 1/4.43;
+
+        y11 = y12 + y15;
+        y21 = y12;
+        y22 = y21 + y23 + y24;
+
+        y32 = y23;
+        y33 = y32;
+
+        y42 = y24;
+        y44 = y42;
+
+        y51 = y15;
+        y55 = y51;
+    }
+
+    public void calc(){
+        init();
+        for (int i = 0; i<80 ;i++){
+            System.out.println("u1: " + Math.abs(u1()));
+            System.out.println("u2: " + Math.abs(u2()));
+            System.out.println("u3: " + Math.abs(u3()));
+            System.out.println("u4: " + Math.abs(u4()));
+            System.out.println("u5: " + Math.abs(u5()));
+        }
+        System.out.println("done");
+    }
+
+    private double u1(){
+//        u1 = (s1/y11) * (1/u1) - (y12/y11)*u2 - (y15/y11)*u5;
+        return u1;
+    }
+
+    private double u2(){
+//        u2 = (s2/y22) * (1/u2) - (y21/y22)*u1 - (y23/y22)*u3 - (y24/y22)*u4;
+        return u2;
+    }
+
+    private double u3(){
+//        u3 = (s3/y33)*(1/u3) - (y32/y33)*u2;
+        return u3;
+    }
+
+    private double u4(){
+//        u4 = (s4/y44)*(1/u4) - (y42/y44)*u2;
+        return u4;
+    }
+
+    private double u5(){
+        u5 = (s5/y55)*(1/u5) - (y51/y55)*u1;
+        return u5;
+    }
+
+}

src/blackstart/testing.java

@@ -0,0 +1,8 @@
+package blackstart;
+
+public class testing {
+    public static void main(String[] args) {
+        testCalc calc = new testCalc(30,30,30,30,1,-1, -5 , 1,-1 ,-1);
+        calc.calc();
+    }
+}