#611: pushed part of the update formulae that work prior to meeting

Author: ppebay

src/lbaf/Execution/lbsTemperedWithUpdatesCriterion.py

@@ -67,6 +67,9 @@ def compute(self, r_src: Rank, o_src: list, r_dst: Rank, o_dst: Optional[list]=N
             self._work_model.compute(r_dst))
 
         # Compute update formulae
+        w_max_up = max(
+            self._work_model.update(r_src, o_src, o_dst),
+            self._work_model.update(r_dst, o_dst, o_src))
 
         # Move objects into proposed new arrangement
         self._phase.transfer_objects(r_src, o_src, r_dst, o_dst)
@@ -80,4 +83,7 @@ def compute(self, r_src: Rank, o_src: list, r_dst: Rank, o_dst: Optional[list]=N
         self._phase.transfer_objects(r_dst, o_src, r_src, o_dst)
 
         # Return criterion value
+        if w_max_new != w_max_up:
+            self._logger.error(f"Discrepancy in post update works: {w_max_new} <> {m_max_up}")
+
         return w_max_0 - w_max_new

src/lbaf/Model/lbsAffineCombinationWorkModel.py

@@ -111,7 +111,7 @@ def compute(self, rank: Rank):
             rank.get_sent_volume(),
             rank.get_homing())
 
-    def update_load(self, rank: Rank, o_snd: list, o_rcv: list):
+    def __update_load(self, rank: Rank, o_snd: list, o_rcv: list):
         """Update total load if objects are to be sent and received."""
         return rank.get_load() + sum(
             o.get_load() for o in o_rcv) - sum(
@@ -122,7 +122,7 @@ def update(self, rank: Rank, o_snd: list, o_rcv: list):
         # Return combination of load and volumes
         return self.affine_combination(
             rank.get_alpha(),
-            rank.update_load(),
+            self.__update_load(rank, o_snd, o_rcv),
             rank.get_received_volume(),
             rank.get_sent_volume(),
             rank.get_homing())