Troppmann, Tom 3 years ago
parent
commit
debc06c4ea
1 changed files with 0 additions and 8 deletions
  1. 0 8
      src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

+ 0 - 8
src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -136,11 +136,7 @@ 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);
@@ -206,11 +202,7 @@ 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);