Merge remote-tracking branch 'origin/updateInProgress' into

updateInProgress

Conflicts:
	src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

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