|
@@ -73,7 +73,6 @@ public class HolonElement {
|
|
|
|
|
|
public HolonElement(String eleName, int amount, float energy) {
|
|
|
this(eleName, amount, energy, IdCounterElem.nextId(),null);//TODO: This is just for the old tests...
|
|
|
- System.out.println("HELL NO");
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -81,7 +80,7 @@ public class HolonElement {
|
|
|
*/
|
|
|
public HolonElement(String eleName, int amount, float energy, int id, Model model){
|
|
|
//if(model!=null)graphLength=model.getGraphIterations();
|
|
|
- //if(graphLength==0)graphLength=DEFAULT_GRAPH_LENGTH;//To counter their constructor bypassing...
|
|
|
+ //if(graphLength==0)graphLength=DEFAULT_GRAPH_LENGTH;//This would work if the used HolonElements were actually made using a proper constructor.
|
|
|
setEleName(eleName);
|
|
|
setAmount(amount);
|
|
|
setEnergyPerElement(energy);
|
|
@@ -157,7 +156,7 @@ public class HolonElement {
|
|
|
* Get the energyPerElement currently available
|
|
|
*/
|
|
|
public float getAvailableEnergyAt(int timestep) {
|
|
|
- return this.availableEnergyPerElementAt[timestep%DEFAULT_GRAPH_LENGTH];//TODO:This would use the variable
|
|
|
+ return this.availableEnergyPerElementAt[timestep%DEFAULT_GRAPH_LENGTH];//TODO:use an attribute here
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -265,7 +264,7 @@ public class HolonElement {
|
|
|
if (flexible) {
|
|
|
return ((float) amount) * energyPerElement;
|
|
|
} else {
|
|
|
- return ((float) amount) * availableEnergyPerElementAt[x%DEFAULT_GRAPH_LENGTH];//TODO: Adapt graph length
|
|
|
+ return ((float) amount) * availableEnergyPerElementAt[x%DEFAULT_GRAPH_LENGTH];//TODO: use an attribute
|
|
|
}
|
|
|
}
|
|
|
|