Merge remote-tracking branch 'refs/remotes/origin/updateInProgress' into updateInProgress

.gitignore

@@ -12,6 +12,9 @@ build/
 .metadata
 bin/
 tmp/
+
+
+*.txt
 *.class
 *.tmp
 *.bak

src/api/AlgorithmFrameworkFlex.java

@@ -580,6 +580,10 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
 		int producingFlex = 0;
 		float producingFlexEnergy = 0.0f;
 		int maxCooldown = 0;
+		int amountEssential = 0;
+		int amountHigh = 0;
+		int amountMedium = 0;
+		int amountLow = 0;
 		for(FlexWrapper flexWrapper :state.getFlexManager().getAllFlexWrapperWithState(FlexState.IN_USE)) {
 			amountOfUsedFlex++;
 			cost += flexWrapper.getFlex().cost;
@@ -592,6 +596,23 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
 				producingFlexEnergy += energy;
 			}
 			if(flexWrapper.getFlex().getCooldown() > maxCooldown) maxCooldown = flexWrapper.getFlex().getCooldown();
+			switch(flexWrapper.getFlex().getElement().getPriority()) {
+			case Essential:
+				amountEssential++;
+				break;
+			case High:
+				amountHigh++;
+				break;
+			case Low:
+				amountLow++;
+				break;
+			case Medium:
+				amountMedium++;
+				break;
+			default:
+				break;
+			
+			}
 		}
 		
 		
@@ -603,6 +624,7 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
 		console.println(consumingFlex + " consuimg flexibilities that consumed " + consumingFlexEnergy + "Energy.");
 		//Producing Flexibilities
 		console.println(producingFlex + " producing flexibilities that produce " + producingFlexEnergy + "Energy.");
+		console.println("Flex in use:\t" + "Low= " + amountLow + "\tMedium= " + amountMedium + "\tHigh= " + amountHigh + "\tEssential= " + amountEssential);
 		//Total cost:
 		console.println("Total Cost: "+ cost);
 		//Longest Cooldown

src/exampleAlgorithms/InformationPanel.java

@@ -16,6 +16,7 @@ import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
@@ -26,38 +27,49 @@ import classes.HolonElement.Priority;
 import ui.controller.Control;
 import ui.controller.FlexManager.FlexState;
 import ui.controller.FlexManager.FlexWrapper;
+import ui.model.DecoratedGroupNode;
 import ui.model.DecoratedHolonObject.HolonObjectState;
 import ui.model.DecoratedState;
+import ui.model.VisualRepresentationalState;
 
 public class InformationPanel implements AddOn {
 	Control control;
 	
 	private JPanel content = new JPanel();
-	
+	private JScrollPane scrollPane;
 	
 	
 	//Fields
-	private int amountHolonObjects;
 	private int amountSwitch;
-	private int amountConsumer;
-		private int	amountUnderSupplied;
-		private int amountPatiallySupplied;
-		private int amountFullySupplied;
-		private int amountOversupllied;
+	private int amountHolonObjects;
+		private int amountConsumer;
+			private int	amountUnderSupplied;
+			private int amountPatiallySupplied;
+			private int amountFullySupplied;
+			private int amountOversupllied;
 		private int amountSupplier;
 	
 	private int amountHolonElements;
 		private int amountActiveHolonElements;
 		private int amountInactiveHolonElements;
 	private int amountFlexibilities;
+	private int amountActiveFlexibilities;
 		private int amountEssential;
+		private int amountActiveEssential;
 		private int amountHigh;
+		private int amountActiveHigh;
 		private int amountMedium;
+		private int amountActiveMedium;
 		private int amountLow;
+		private int amountActiveLow;
 
 		private int amountConsumingFlexibilities;
 		private int amountProducingFlexibilities;
 	private int amountPassiv;
+		
+	private int amountHolons;
+	private float averageConsumption;
+	private float averageProduction;
 	
 	List<Entry> entryList = new ArrayList<Entry>();
 
@@ -66,11 +78,19 @@ public class InformationPanel implements AddOn {
 
 
 
+
+
+
+
 	
 	
 	public InformationPanel(){
 		content.setLayout(new BorderLayout());
-		content.add(createMiddlePanel(), BorderLayout.CENTER);
+		scrollPane = new JScrollPane(createMiddlePanel(),  JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+	            JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		int size = 75;
+		scrollPane.setPreferredSize(new Dimension(16*size, 9*size));
+		content.add(scrollPane, BorderLayout.CENTER);
 		JButton button = new JButton("calculate");
 		button.addActionListener(action -> updateEntrys());
 		content.add(button, BorderLayout.SOUTH);
@@ -91,8 +111,7 @@ public class InformationPanel implements AddOn {
 		JPanel middle = new JPanel();
 		middle.setLayout(new GridBagLayout());
 		
-		int size = 60;
-		middle.setPreferredSize(new Dimension(16*size, 9*size));
+		
 		
 
 		entryList.add(new Entry(() -> Integer.toString(amountHolonObjects), "amountHolonObjects", middle));
@@ -120,8 +139,17 @@ public class InformationPanel implements AddOn {
 		entryList.add(new Entry(() -> Integer.toString(amountMedium) + addPercentage(amountMedium, amountFlexibilities), "\tamountMedium", middle));
 		entryList.add(new Entry(() -> Integer.toString(amountHigh) + addPercentage(amountHigh, amountFlexibilities), "\tamountHigh", middle));
 		entryList.add(new Entry(() -> Integer.toString(amountEssential) + addPercentage(amountEssential, amountFlexibilities), "\tamountEssential", middle));
-		
-		
+		addSeperator(middle);
+		entryList.add(new Entry(() -> Integer.toString(amountActiveFlexibilities), "amountActiveFlexibilities", middle));
+		entryList.add(new Entry(() -> Integer.toString(amountActiveLow) + addPercentage(amountActiveLow, amountActiveFlexibilities), "\tamountActiveLow", middle));
+		entryList.add(new Entry(() -> Integer.toString(amountActiveMedium) + addPercentage(amountActiveMedium, amountActiveFlexibilities), "\tamountActiveMedium", middle));
+		entryList.add(new Entry(() -> Integer.toString(amountActiveHigh) + addPercentage(amountActiveHigh, amountActiveFlexibilities), "\tamountActiveHigh", middle));
+		entryList.add(new Entry(() -> Integer.toString(amountActiveEssential) + addPercentage(amountActiveEssential, amountActiveFlexibilities), "\tamountActiveEssential", middle));
+		addSeperator(middle);
+		entryList.add(new Entry(() -> Integer.toString(amountHolons), "amountHolons", middle));
+		addSeperator(middle);
+		entryList.add(new Entry(() -> String.format (Locale.US, "%.2f", averageConsumption), "averageConsumption", middle));
+		entryList.add(new Entry(() -> String.format (Locale.US, "%.2f", averageProduction), "averageProduction", middle));
 		
 		return middle;
 	}
@@ -197,6 +225,18 @@ public class InformationPanel implements AddOn {
 		amountMedium = (int)flexList.stream().filter(flex -> flex.getElement().getPriority() == Priority.Medium).count();
 		amountLow = (int)flexList.stream().filter(flex -> flex.getElement().getPriority() == Priority.Low).count();
 		this.amountFlexibilities = amountEssential + amountHigh + amountMedium + amountLow;
+		
+		
+		List<Flexibility> flexActiveList = control.getSimManager().getActualFlexManager().getAllFlexWrapperWithState(FlexState.IN_USE).stream().map(flex -> flex.getFlex()).collect(Collectors.toList());
+		amountActiveEssential = (int)flexActiveList.stream().filter(flex -> flex.getElement().getPriority() == Priority.Essential).count();
+		amountActiveHigh = (int)flexActiveList.stream().filter(flex -> flex.getElement().getPriority() == Priority.High).count();
+		amountActiveMedium = (int)flexActiveList.stream().filter(flex -> flex.getElement().getPriority() == Priority.Medium).count();
+		amountActiveLow = (int)flexActiveList.stream().filter(flex -> flex.getElement().getPriority() == Priority.Low).count();
+		this.amountActiveFlexibilities = amountActiveEssential + amountActiveHigh + amountActiveMedium + amountActiveLow;
+		VisualRepresentationalState visualState =control.getSimManager().getActualVisualRepresentationalState();
+		amountHolons = visualState.getAmountOfHolons();
+		averageConsumption =  visualState.getAverageConsumption();
+		averageProduction =  visualState.getAverageProduction();
 		int cost = 0;
 		int consumingFlex = 0;
 		float consumingFlexEnergy = 0.0f;
@@ -220,6 +260,8 @@ public class InformationPanel implements AddOn {
 	}
 	
 	
+
+	
 	@Override
 	public JPanel getPanel() {
 		return content;

src/ui/model/DecoratedGroupNode.java

@@ -74,45 +74,56 @@ public class DecoratedGroupNode {
 		return groupNodeList;
 	}
 	
+	
+	//Returns the amount of holons and count himself 
+	public int getAmountOfHolons() {
+		return 1 + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfHolons()).reduce(0, Integer::sum);
+	}
+	
+	
 	//Gather Informations:
 	public int getAmountOfSupplier() {
-		return supplierList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfSupplier()).reduce(0, (a,b)->a+b);
+		return supplierList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfSupplier()).reduce(0, Integer::sum);
 	}
 	public int getAmountOfConsumer() {
-		return consumerList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfConsumer()).reduce(0, (a,b)->a+b);
+		return consumerList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfConsumer()).reduce(0,Integer::sum);
 	}
 	public int getAmountOfPassiv() {
-		return passivList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfPassiv()).reduce(0, (a,b)->a+b);
+		return passivList.size() + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfPassiv()).reduce(0, Integer::sum);
 	}
 	
 	public int getAmountOfConsumerWithState(HolonObjectState state) {
-		return ((int) consumerList.stream().map(con -> con.getState()).filter(rightState -> (rightState == state)).count()) +  groupNodeList.stream().map(groupNode -> groupNode.getAmountOfConsumerWithState(state)).reduce(0, (a,b)->a+b);
+		return ((int) consumerList.stream().map(con -> con.getState()).filter(rightState -> (rightState == state)).count()) +  groupNodeList.stream().map(groupNode -> groupNode.getAmountOfConsumerWithState(state)).reduce(0, Integer::sum);
 	}
 	
 	public int getAmountOfElemntsFromHolonObjects() {
-		return passivList.stream().map(object -> object.getModel().getElements().size()).reduce(0, (a, b) -> a + b)+
-				supplierList.stream().map(object -> object.getModel().getElements().size()).reduce(0, (a, b) -> a + b)+
-				consumerList.stream().map(object -> object.getModel().getElements().size()).reduce(0, (a, b) -> a + b)+
-				groupNodeList.stream().map(groupNode -> groupNode.getAmountOfElemntsFromHolonObjects()).reduce(0, (a,b)->a+b);
+		return passivList.stream().map(object -> object.getModel().getElements().size()).reduce(0, Integer::sum)+
+				supplierList.stream().map(object -> object.getModel().getElements().size()).reduce(0, Integer::sum)+
+				consumerList.stream().map(object -> object.getModel().getElements().size()).reduce(0, Integer::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getAmountOfElemntsFromHolonObjects()).reduce(0, Integer::sum);
 	}
 
 	public int getAmountOfAktiveElemntsFromHolonObjects() {
-		return passivList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, (a, b) -> a + b)+
-				supplierList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, (a, b) -> a + b)+
-				consumerList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, (a, b) -> a + b)+
-				groupNodeList.stream().map(groupNode -> groupNode.getAmountOfAktiveElemntsFromHolonObjects()).reduce(0, (a,b)->a+b);
+		return passivList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, Integer::sum)+
+				supplierList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, Integer::sum)+
+				consumerList.stream().map(object -> object.getModel().getNumberOfActiveElements()).reduce(0, Integer::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getAmountOfAktiveElemntsFromHolonObjects()).reduce(0, Integer::sum);
 	}
 	public float getConsumptionFromConsumer() {		
-		return consumerList.stream().map(con -> con.getEnergyNeededFromNetwork()).reduce(0.f, (a, b) -> a + b)+
-				groupNodeList.stream().map(groupNode -> groupNode.getConsumptionFromConsumer()).reduce(0.f, (a,b)->a+b);
+		return consumerList.stream().map(con -> con.getEnergyNeededFromNetwork()).reduce(0.f, Float::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getConsumptionFromConsumer()).reduce(0.f, Float::sum);
 	}
 	public float getProductionFromSupplier() {		
-		return supplierList.stream().map(sup -> sup.getEnergyToSupplyNetwork()).reduce(0.f, (a, b) -> a + b)+
-				groupNodeList.stream().map(groupNode -> groupNode.getProductionFromSupplier()).reduce(0.f, (a,b)->a+b);
+		return supplierList.stream().map(sup -> sup.getEnergyToSupplyNetwork()).reduce(0.f, Float::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getProductionFromSupplier()).reduce(0.f, Float::sum);
 	}
 	
-	
-	
+	public float getAverageConsumption() {
+		return getConsumptionFromConsumer() / (float)getAmountOfHolons();
+	}
+	public float getAverageProduction() {
+		return getProductionFromSupplier() / (float)getAmountOfHolons();
+	}
 	
 	
 	public String toString() {

src/ui/model/VisualRepresentationalState.java

@@ -274,6 +274,36 @@ public class VisualRepresentationalState {
 	private <DecoratedObject> void addToGroupNode(DecoratedObject object, ArrayList<DecoratedObject> groupNodeListPar) {
 		groupNodeListPar.add(object);
 	}
+	
+	
+	
+	
+	public int getAmountOfHolons() {
+		return 1 + groupNodeList.stream().map(groupNode -> groupNode.getAmountOfHolons()).reduce(0, Integer::sum);
+	}
+	
+	
+	
+	public float getConsumptionFromConsumer() {		
+		return consumerList.stream().map(con -> con.getEnergyNeededFromNetwork()).reduce(0.f, Float::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getConsumptionFromConsumer()).reduce(0.f, Float::sum);
+	}
+	public float getProductionFromSupplier() {		
+		return supplierList.stream().map(sup -> sup.getEnergyToSupplyNetwork()).reduce(0.f, Float::sum)+
+				groupNodeList.stream().map(groupNode -> groupNode.getProductionFromSupplier()).reduce(0.f, Float::sum);
+	}
+	
+	public float getAverageConsumption() {
+		return getConsumptionFromConsumer() / (float)getAmountOfHolons();
+	}
+	public float getAverageProduction() {
+		return getProductionFromSupplier() / (float)getAmountOfHolons();
+	}
+	
+	
+	
+	
+	
 
 	//Generics
 	private <ModelOfObject, DecoratedObject> DecoratedGroupNode addObject(HashMap<ModelOfObject, CpsUpperNode> inGroupObjects, ModelOfObject modelOfObject, ArrayList<DecoratedObject> listToAdd, DecoratedObject object, HashMap<CpsUpperNode, DecoratedGroupNode> createdGroupNodes) {