Browse Source

SomeFixes

dominik.rieder 7 years ago
parent
commit
ebaf7a45d4
2 changed files with 9 additions and 11 deletions
  1. 2 0
      src/classes/CpsEdge.java
  2. 7 11
      src/ui/controller/SimulationManager.java

+ 2 - 0
src/classes/CpsEdge.java

@@ -48,6 +48,8 @@ public class CpsEdge {
 		this.flow = flow;
 		if(flow > maxCapacity){
 			isWorking = false;
+		}else{
+			isWorking = true;
 		}
 	}
 	

+ 7 - 11
src/ui/controller/SimulationManager.java

@@ -33,24 +33,20 @@ public class SimulationManager {
 				e.setFlow(production);
 			}
 			for(HolonObject hl: singleSubNet.getObjects()){
-				boolean end = false;
-				int i = 0;
-				while(!end){
+				for(int i = 0; i < hl.getConnections().size(); i++){
 					CpsEdge edge = hl.getConnectedTo().get(i);
 					if(edge.getState()){
-						if(hl.getCurrentEnergyAtTimeStep(x) + edge.getFlow() >= 0 ){
+						System.out.println(hl.getCurrentEnergyAtTimeStep(x));
+						System.out.println(edge.getFlow());
+						if((hl.getCurrentEnergyAtTimeStep(x) + edge.getFlow()) >= 0 ){
 							hl.setSupplied(true);
 						}else{
 							hl.setSupplied(false);
 						}
-						end = true;
-					}else{
-						i++;
-						if(i == singleSubNet.getObjects().size() - 1){
-							end = true;
-						}
+						break;
 					}
 				}
+				System.out.println(hl.getName() + "is supplied:" + hl.getSupplied());
 			}
 		}
 		
@@ -100,7 +96,7 @@ public class SimulationManager {
 				}
 			}
 		}
-		printNet();
+		//printNet();
 	}
 	
 	/**