#37 updated calcMaximum Method

src/ui/view/StatisticGraph.java

@@ -197,7 +197,7 @@ public class StatisticGraph extends JPanel {
 			case TrackedDataSet.CONSUMPTION:
 				for (HolonElement h : ((HolonObject) set.getCpsObject()).getElements()) {
 					if (h.getEnergy() < 0) {
-						val += h.getEnergy() * h.getAmount();
+						val += (h.getEnergy() + h.getFlexibility()) * h.getAmount();
 					}
 				}
 				val *= -1;
@@ -205,7 +205,7 @@ public class StatisticGraph extends JPanel {
 			case TrackedDataSet.PRODUCTION:
 				for (HolonElement h : ((HolonObject) set.getCpsObject()).getElements()) {
 					if (h.getEnergy() > 0) {
-						val += h.getEnergy() * h.getAmount();
+						val += (h.getEnergy() + h.getFlexibility()) * h.getAmount();
 					}
 				}
 				break;
@@ -619,7 +619,7 @@ public class StatisticGraph extends JPanel {
 			if (obj instanceof HolonObject) {
 				for (HolonElement ele : ((HolonObject) obj).getElements()) {
 					if (ele.getEnergy() > 0) {
-						val += ele.getEnergy() * ele.getAmount();
+						val += (ele.getEnergy() + ele.getFlexibility()) * ele.getAmount();
 					}
 				}
 			} else if (obj instanceof CpsUpperNode) {
@@ -642,7 +642,7 @@ public class StatisticGraph extends JPanel {
 			if (obj instanceof HolonObject) {
 				for (HolonElement ele : ((HolonObject) obj).getElements()) {
 					if (ele.getEnergy() < 0) {
-						val += ele.getEnergy() * ele.getAmount();
+						val += (ele.getEnergy() + ele.getFlexibility()) * ele.getAmount();
 					}
 				}
 			} else if (obj instanceof CpsUpperNode) {
@@ -666,7 +666,11 @@ public class StatisticGraph extends JPanel {
 			if (obj instanceof HolonObject) {
 				for (HolonElement ele : ((HolonObject) obj).getElements()) {
 					if (ele.getEnergyAt()[tStep] > 0 && ele.getActive()) {
-						val += ele.getEnergyAt()[tStep] * ele.getAmount();
+						if (ele.getActiveFlex()) {
+							val += (ele.getEnergyAt()[tStep]+ele.getFlexibility()) * ele.getAmount();
+						} else {
+							val += ele.getEnergyAt()[tStep] * ele.getAmount();
+						}
 					}
 				}
 			} else if (obj instanceof CpsUpperNode) {
@@ -690,7 +694,11 @@ public class StatisticGraph extends JPanel {
 			if (obj instanceof HolonObject) {
 				for (HolonElement ele : ((HolonObject) obj).getElements()) {
 					if (ele.getEnergyAt()[tStep] < 0 && ele.getActive()) {
-						val += ele.getEnergyAt()[tStep] * ele.getAmount();
+						if (ele.getActiveFlex()) {
+							val += (ele.getEnergyAt()[tStep]+ele.getFlexibility()) * ele.getAmount();
+						} else {
+							val += ele.getEnergyAt()[tStep] * ele.getAmount();
+						}
 					}
 				}
 			} else if (obj instanceof CpsUpperNode) {