|
@@ -71,11 +71,11 @@ public class StorageElement extends HolonElement {
|
|
|
if (stateOfCharge >= energy) { // enough energy stored than wanted
|
|
|
if (energy >= maxInRatio) { // more energy wanted than can be given
|
|
|
this.setEnergyPerElement(maxOutRatio);
|
|
|
- stateOfCharge = stateOfCharge - maxOutRatio;//TODO: not hear but in simulation manager
|
|
|
+// stateOfCharge = stateOfCharge - maxOutRatio;//TODO: not hear but in simulation manager
|
|
|
return maxOutRatio;
|
|
|
} else { // less energy wanted that can be given
|
|
|
this.setEnergyPerElement(energy);
|
|
|
- stateOfCharge = stateOfCharge - energy;
|
|
|
+// stateOfCharge = stateOfCharge - energy;
|
|
|
return energy;
|
|
|
}
|
|
|
} else {// not enough energy stored than wanted
|
|
@@ -84,7 +84,7 @@ public class StorageElement extends HolonElement {
|
|
|
return 0;
|
|
|
} else { // emit energy that is available even though is less that wanted
|
|
|
this.setEnergyPerElement(stateOfCharge);
|
|
|
- stateOfCharge = 0;
|
|
|
+// stateOfCharge = 0;
|
|
|
return stateOfCharge;
|
|
|
}
|
|
|
}
|
|
@@ -92,11 +92,11 @@ public class StorageElement extends HolonElement {
|
|
|
if (energy >= maxInRatio) { // more engery given than can be collected
|
|
|
if (stateOfCharge + maxInRatio > capacity) { // Storage nearly full only load rest to get full
|
|
|
this.setEnergyPerElement(-(capacity - stateOfCharge));
|
|
|
- stateOfCharge = capacity;
|
|
|
+// stateOfCharge = capacity;
|
|
|
return capacity - stateOfCharge;
|
|
|
} else { // load with maximal of what can be collected
|
|
|
this.setEnergyPerElement(-maxInRatio);
|
|
|
- stateOfCharge = stateOfCharge + maxInRatio;
|
|
|
+// stateOfCharge = stateOfCharge + maxInRatio;
|
|
|
return maxInRatio;
|
|
|
}
|
|
|
} else { // less engery given than can be taken in
|
|
@@ -106,11 +106,11 @@ public class StorageElement extends HolonElement {
|
|
|
} else {
|
|
|
if (stateOfCharge + energy > capacity) { // Storage nearly full only load rest to get full
|
|
|
this.setEnergyPerElement(-(capacity - stateOfCharge));
|
|
|
- stateOfCharge = capacity;
|
|
|
+// stateOfCharge = capacity;
|
|
|
return capacity - stateOfCharge;
|
|
|
} else { // take all engery that is available
|
|
|
this.setEnergyPerElement(-energy);
|
|
|
- stateOfCharge = stateOfCharge + energy;
|
|
|
+// stateOfCharge = stateOfCharge + energy;
|
|
|
return energy;
|
|
|
}
|
|
|
}
|
|
@@ -125,6 +125,23 @@ public class StorageElement extends HolonElement {
|
|
|
return this.status;
|
|
|
}
|
|
|
|
|
|
+ public void chargeCalc(){
|
|
|
+ switch (status){
|
|
|
+ case COLLECT:
|
|
|
+ stateOfCharge = stateOfCharge - getEnergyPerElement();
|
|
|
+ break;
|
|
|
+ case EMIT:
|
|
|
+ stateOfCharge = stateOfCharge + getEnergyPerElement();
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ }
|
|
|
+ if(stateOfCharge <= 0 || stateOfCharge >= capacity){
|
|
|
+ status = Mode.STANDBY;
|
|
|
+ setEnergyPerElement(0);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
public void setStateOfCharge(float stateOfCharge){
|
|
|
if(stateOfCharge < capacity){
|
|
|
this.stateOfCharge = stateOfCharge;
|