Flexibility changes (#40 and #37)

src/classes/HolonElement.java

@@ -56,6 +56,7 @@ public class HolonElement {
 	 * beginning, it starts with all values at energy
 	 */
 	private float[] energyAt;
+
 	// Points on the UnitGraph
 	LinkedList<Point> graphPoints;
 
@@ -228,7 +229,11 @@ public class HolonElement {
 	 * @return totalEnergy (actual)
 	 */
 	public float getTotalEnergy() {
-		totalEnergy = ((float) amount) * energy;
+		if (activeFlex) {
+			totalEnergy = ((float) amount) * (energy + flexibility);
+		} else {
+			totalEnergy = ((float) amount) * energy;
+		}
 		return totalEnergy;
 	}
 
@@ -240,7 +245,12 @@ public class HolonElement {
 	 * @return energy value
 	 */
 	public float getTotalEnergyAtTimeStep(int x) {
-		float result = ((float) amount) * energyAt[x];
+		float result = 0;
+		if (activeFlex) {
+			result = ((float) amount) * (energyAt[x] + flexibility);
+		} else {
+			result = ((float) amount) * energyAt[x];
+		}
 		return result;
 	}
 

src/ui/view/FlexibleData.java

@@ -22,42 +22,42 @@ public class FlexibleData extends JPanel {
 		setlblName(name);
 		add(name_lbl);
 		
-		JLabel lblFlProd = new JLabel("Flex. Prod.  :");
+		JLabel lblFlProd = new JLabel("Flex. Prod.:");
 		lblFlProd.setForeground(new Color(0, 128, 0));
-		lblFlProd.setBounds(31, 46, 65, 27);
+		lblFlProd.setBounds(31, 46, 85, 27);
 		add(lblFlProd);
 		
-		JLabel lblFlexCons = new JLabel("Flex. Cons.  :\r\n");
+		JLabel lblFlexCons = new JLabel("Flex. Cons.:\r\n");
 		lblFlexCons.setForeground(new Color(255, 0, 0));
-		lblFlexCons.setBounds(181, 46, 65, 27);
+		lblFlexCons.setBounds(160, 46, 85, 27);
 		add(lblFlexCons);
 		
-		JLabel lblProdCons = new JLabel("Prod./Cons. :");
+		JLabel lblProdCons = new JLabel("Prod./Cons.:");
 		lblProdCons.setForeground(new Color(218, 165, 32));
-		lblProdCons.setBounds(327, 46, 65, 27);
+		lblProdCons.setBounds(300, 46, 85, 27);
 		add(lblProdCons);
 		
 		lblProdVal = new JLabel();
 		setProd(prod);
-		lblProdVal.setBounds(100, 47, 72, 24);
+		lblProdVal.setBounds(106, 47, 72, 24);
 		add(lblProdVal);
 		
 		lblConsVal = new JLabel();
 		setCons(cons);
-		lblConsVal.setBounds(252, 47, 72, 24);
+		lblConsVal.setBounds(240, 47, 72, 24);
 		add(lblConsVal);
 		
 		lblProdConsVal = new JLabel();
 		if(cons != 0 && prod != 0){
 		lblProdConsVal.setText(Float.toString((prod/cons)*(-1)));
 		}else if(prod == 0 && cons == 0){
-			lblProdConsVal.setText("not producing or consuming...");
+			lblProdConsVal.setText("neither producing nor consuming...");
 		}else if(prod == 0){
 			lblProdConsVal.setText("only consuming...");
 		}else if(cons == 0){
 			lblProdConsVal.setText("only producing...");
 		}
-		lblProdConsVal.setBounds(402, 46, 173, 24);
+		lblProdConsVal.setBounds(380, 46, 240, 24);
 		add(lblProdConsVal);
 	}
 	
@@ -73,7 +73,7 @@ public class FlexibleData extends JPanel {
 		if(cons != 0 && prod != 0){
 		lblProdConsVal.setText(Float.toString((prod/cons)*(-1)));
 		}else if(prod == 0 && cons == 0){
-			lblProdConsVal.setText("not producing or consuming...");
+			lblProdConsVal.setText("neither producing nor consuming...");
 		}else if(prod == 0){
 			lblProdConsVal.setText("only consuming...");
 		}else if(cons == 0){