Change wt to be sum of border scores, not product

IP-MATCH · Sep 10, 2019 · 9d0493f · 9d0493f
1 parent 8fbf747
commit 9d0493f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SMTI/3_NOBIN_1STA_YESMERGED_MAXWT/main.cpp b/SMTI/3_NOBIN_1STA_YESMERGED_MAXWT/main.cpp
@@ -99,7 +99,7 @@ int manlove(Allocation& allo, int mode){
 							}
 						}
 					}
-					int score = (allo.nbFamilies - j) * (allo.nbChildren - fam_pref);
+					int score = (allo.nbFamilies - j) + (allo.nbChildren - fam_pref);
 					objFun += score*isChildIAllocatedToFamilyJ[i][j][k];
 				}
 			}

diff --git a/SMTI/4_YESBIN_1STA_YESMERGED_MAXWT/main.cpp b/SMTI/4_YESBIN_1STA_YESMERGED_MAXWT/main.cpp
@@ -98,7 +98,7 @@ int manlove(Allocation& allo, int mode){
 							}
 						}
 					}
-					int score = (allo.nbFamilies - j) * (allo.nbChildren - fam_pref);
+					int score = (allo.nbFamilies - j) + (allo.nbChildren - fam_pref);
 					objFun += score*isChildIAllocatedToFamilyJ[i][j][k];
 				}
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ int manlove(Allocation& allo, int mode){ @@
     							}
     						}
     					}
-    					int score = (allo.nbFamilies - j) * (allo.nbChildren - fam_pref);
+    					int score = (allo.nbFamilies - j) + (allo.nbChildren - fam_pref);
     					objFun += score*isChildIAllocatedToFamilyJ[i][j][k];
     				}
     			}
@@ Expand Down @@