|
@@ -136,7 +136,7 @@ public class TopologieObjectiveFunction {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- for(DecoratedHolonObject dHobject : net.getConsumerList()) {
|
|
|
+ for(DecoratedHolonObject dHobject : net.getConsumerSelfSuppliedList()) {
|
|
|
if(dHobject.getModel().getName().contains("Wildcard")){
|
|
|
if(dHobject.getModel().getName().length() > 9) {
|
|
|
String costString = dHobject.getModel().getName().substring(9);
|
|
@@ -202,7 +202,7 @@ public class TopologieObjectiveFunction {
|
|
|
* F_grid is already squashed
|
|
|
*/
|
|
|
return (float) (w_eb * squash(f_eb, k_eb)
|
|
|
- + w_max * squash(f_holon, k_max)
|
|
|
+ + w_max * squash(f_maximum, k_max)
|
|
|
+ w_holon * squash(f_holon, k_holon)
|
|
|
+ w_selection * squash(f_selection, k_selection)
|
|
|
+ w_grid * f_grid);
|