Merge pull request #254 from barisdemirdelen/fix_vdf_not_calculated_l…

…ast_iteration

Fix vdf not calculated last iteration of assignment

aequilibrae/paths/linear_approximation.py

@@ -405,6 +405,15 @@ def execute(self):
             # This needs to be done with the current costs, and not the future ones
             converged = self.check_convergence() if self.iter > 1 else False
 
+            self.vdf.apply_vdf(
+                self.congested_time,
+                self.fw_total_flow,
+                self.capacity,
+                self.free_flow_tt,
+                *self.vdf_parameters,
+                self.cores,
+            )
+
             self.convergence_report["iteration"].append(self.iter)
             self.convergence_report["rgap"].append(self.rgap)
             self.convergence_report["warnings"].append("; ".join(self.iteration_issue))
@@ -415,6 +424,13 @@ def execute(self):
                 self.convergence_report["beta1"].append(self.betas[1])
                 self.convergence_report["beta2"].append(self.betas[2])
 
+            for c in self.traffic_classes:
+                c._aon_results.reset()
+                if self.time_field not in c.graph.skim_fields:
+                    continue
+                idx = c.graph.skim_fields.index(self.time_field)
+                c.graph.skims[:, idx] = self.congested_time[:]
+
             logger.info(f"{self.iter},{self.rgap},{self.stepsize}")
             if converged:
                 self.steps_below += 1
@@ -423,22 +439,6 @@ def execute(self):
             else:
                 self.steps_below = 0
 
-            self.vdf.apply_vdf(
-                self.congested_time,
-                self.fw_total_flow,
-                self.capacity,
-                self.free_flow_tt,
-                *self.vdf_parameters,
-                self.cores,
-            )
-
-            for c in self.traffic_classes:
-                c._aon_results.reset()
-                if self.time_field not in c.graph.skim_fields:
-                    continue
-                idx = c.graph.skim_fields.index(self.time_field)
-                c.graph.skims[:, idx] = self.congested_time[:]
-
         for c in self.traffic_classes:
             c.results.link_loads /= c.pce
             c.results.total_flows()