huff 1.5.6__py3-none-any.whl → 1.5.7__py3-none-any.whl

huff/models.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.5.5
-# Last update: 2025-07-26 13:42
+# Version:     1.5.6
+# Last update: 2025-08-01 14:00
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -590,6 +590,12 @@ class InteractionMatrix:
             if interaction_matrix_metadata["fit"]["function"] == "huff_ml_fit":
                 print("Fit method          " + interaction_matrix_metadata["fit"]["method"] + " (Converged: " + str(interaction_matrix_metadata["fit"]["minimize_success"]) + ")")
 
+        return [
+            customer_origins_metadata,
+            supply_locations_metadata,
+            interaction_matrix_metadata
+            ]
+
     def transport_costs(
         self,
         network: bool = True,
@@ -1642,6 +1648,8 @@ class HuffModel:
                     
         print("----------------------------------")
 
+        huff_modelfit = None
+
         if interaction_matrix_metadata != {} and "fit" in interaction_matrix_metadata and interaction_matrix_metadata["fit"]["function"] is not None:
             print("Parameter estimation")
             print("Fit function        " + interaction_matrix_metadata["fit"]["function"])
@@ -1682,6 +1690,13 @@ class HuffModel:
                     
                 print("----------------------------------")
 
+        return [
+            customer_origins_metadata,
+            supply_locations_metadata,
+            interaction_matrix_metadata,
+            huff_modelfit
+            ]
+
     def mci_fit(
         self,
         cols: list = ["A_j", "t_ij"],
@@ -2341,6 +2356,7 @@ class MCIModel:
 
         customer_origins_metadata = interaction_matrix.get_customer_origins().get_metadata()
         supply_locations_metadata = interaction_matrix.get_supply_locations().get_metadata()
+        interaction_matrix_metadata = interaction_matrix.get_metadata()
 
         print("Multiplicative Competitive Interaction Model")
         print("--------------------------------------------")
@@ -2371,7 +2387,10 @@ class MCIModel:
 
         print("--------------------------------------------")
         
+        mci_modelfit = None
+
         mci_modelfit = self.modelfit()
+
         if mci_modelfit is not None:
             
             print ("Goodness-of-fit for probabilities")
@@ -2402,6 +2421,13 @@ class MCIModel:
             print(APE_df.to_string(index=False))
             
             print("--------------------------------------------")
+
+        return [
+            customer_origins_metadata,
+            supply_locations_metadata,
+            interaction_matrix_metadata,
+            mci_modelfit
+            ]
                   
     def utility(
         self,

huff/tests/tests_huff.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.5.6
-# Last update: 2025-07-31 18:33
+# Version:     1.5.7
+# Last update: 2025-08-01 14:01
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.5.6.dist-info → huff-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.5.6
+Version: 1.5.7
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -28,11 +28,9 @@ Thomas Wieland [ORCID](https://orcid.org/0000-0001-5168-9846) [EMail](mailto:geo
 See the /tests directory for usage examples of most of the included functions.
 
 
-## Updates v1.5.6
+## Updates v1.5.7
 - Extensions:
-  - gistools.distance_matrix() now includes line geometry output
-- Other
-  - map_with_basemap() now belongs to huff.gistools
+  - InteractionMatrix.summary(), MCIModel.summary() and HuffModel.summary() now return metadata and model fit (if available)
   
 
 ## Features

{huff-1.5.6.dist-info → huff-1.5.7.dist-info}/RECORD

@@ -1,10 +1,10 @@
 huff/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 huff/gistools.py,sha256=cffGqNRaCaIE0f52j5bGpgbdxMxy8zmeMQqPhrVSfOE,12890
-huff/models.py,sha256=yrV4enajAG0bHCgrGh3w-SNX5kJDJnuE28i6RXN30HE,134903
+huff/models.py,sha256=KBey1HLPKDHLfT6WkDofeF3XGhp8c19FfAyhietvM8U,135564
 huff/ors.py,sha256=JlO2UEishQX87PIiktksOrVT5QdB-GEWgjXcxoR_KuA,11929
 huff/osm.py,sha256=1a74HkKgAJYLWdthnAslOEJiHYz7qI3dk7u4ku6Jq0o,3563
 huff/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-huff/tests/tests_huff.py,sha256=B7C74NhXPtuwWY8X-5dxrB5GQLnT4OqgId4ZSGaTBQo,13095
+huff/tests/tests_huff.py,sha256=ntSiRoqPv57NkSLYFhUeh9f6uwVlfHul1wO1PipLrPU,13095
 huff/tests/data/Haslach.cpg,sha256=OtMDH1UDpEBK-CUmLugjLMBNTqZoPULF3QovKiesmCQ,5
 huff/tests/data/Haslach.dbf,sha256=GVPIt05OzDO7UrRDcsMhiYWvyXAPg6Z-qkiysFzj-fc,506
 huff/tests/data/Haslach.prj,sha256=2Jy1Vlzh7UxQ1MXpZ9UYLs2SxfrObj2xkEkZyLqmGTY,437
@@ -24,7 +24,7 @@ huff/tests/data/Haslach_supermarkets.qmd,sha256=JlcOYzG4vI1NH1IuOpxwIPnJsCyC-pDR
 huff/tests/data/Haslach_supermarkets.shp,sha256=X7QbQ0BTMag_B-bDRbpr-go2BQIXo3Y8zMAKpYZmlps,324
 huff/tests/data/Haslach_supermarkets.shx,sha256=j23QHX-SmdAeN04rw0x8nUOran-OCg_T6r_LvzzEPWs,164
 huff/tests/data/Wieland2015.xlsx,sha256=H4rxCFlctn44-O6mIyeFf67FlgvznLX7xZqpoWYS41A,25788
-huff-1.5.6.dist-info/METADATA,sha256=4ZRQx28t5HIXwoHSlNG-S2Q0hocMBAnhmgkYEkV95PI,6023
-huff-1.5.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-huff-1.5.6.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
-huff-1.5.6.dist-info/RECORD,,
+huff-1.5.7.dist-info/METADATA,sha256=1sLuRb8CQ-RtYaA2kpUxoNBWRWuH5BEzMmi78_NNj-0,6021
+huff-1.5.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+huff-1.5.7.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
+huff-1.5.7.dist-info/RECORD,,