Merge pull request #48 from Transport-for-the-North/calibrate-results…

…-summary-fix

Calibrate results summary fix

src/caf/distribute/gravity_model/core.py

@@ -119,7 +119,7 @@ def plot_distributions(self, truncate_last_bin: bool = False) -> figure.Figure:
         fig, ax = plt.subplots(figsize=(10, 6))
 
         errors = []
-        for attr in ("max_vals", "min_vals", "avg_vals"):
+        for attr in ("max_vals", "min_vals"):
             if set(getattr(self.cost_distribution, attr)) != set(
                 getattr(self.target_cost_distribution, attr)
             ):
@@ -134,7 +134,7 @@ def plot_distributions(self, truncate_last_bin: bool = False) -> figure.Figure:
 
         max_bin_edge = self.cost_distribution.max_vals
         min_bin_edge = self.cost_distribution.min_vals
-        bin_centres = self.cost_distribution.avg_vals
+        bin_centres = (max_bin_edge + min_bin_edge) / 2
 
         ax.bar(
             bin_centres,
@@ -177,6 +177,10 @@ def summary(self) -> pd.Series:
             a summary of the calibration
         """
 
+        output_params = self.cost_params.copy()
+        output_params["convergence"] = self.cost_convergence
+        return pd.Series(output_params)
+
 
 @dataclasses.dataclass
 class GravityModelRunResults(GravityModelResults):

src/caf/distribute/gravity_model/multi_area.py

@@ -462,7 +462,7 @@ def from_pandas(
         cat_tld = tld[tld[tld_cat_col] == category]
 
         cat_cost_distribution = cost_utils.CostDistribution(
-            cat_tld, tld_min_col, tld_max_col, tld_avg_col, tld_trips_col, tld_avg_col
+            cat_tld, tld_min_col, tld_max_col, tld_avg_col, tld_trips_col
         )
 
         return cls(category, cat_cost_distribution, cat_zone_indices, func_params)