huff 1.5.4__tar.gz → 1.5.5__tar.gz

{huff-1.5.4 → huff-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.5.4
+Version: 1.5.5
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -18,10 +18,10 @@ 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.4
+## Updates v1.5.5
 - Bugfixes:
-  - Use of check_vars() is now optional (default: True)
-  - Correction of args argument when calling minimize() in huff_ml_fit() 
+  - Removing i = j cases in InteractionMatrix.hansen()
+  - InteractionMatrix.utility(): Check for utility column 
   
 
 ## Features

{huff-1.5.4 → huff-1.5.5}/README.md

@@ -10,10 +10,10 @@ 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.4
+## Updates v1.5.5
 - Bugfixes:
-  - Use of check_vars() is now optional (default: True)
-  - Correction of args argument when calling minimize() in huff_ml_fit() 
+  - Removing i = j cases in InteractionMatrix.hansen()
+  - InteractionMatrix.utility(): Check for utility column 
   
 
 ## Features

{huff-1.5.4 → huff-1.5.5}/huff/models.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.5.4
-# Last update: 2025-07-18 18:07
+# Version:     1.5.5
+# Last update: 2025-07-26 13:42
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -944,15 +944,21 @@ class InteractionMatrix:
 
     def hansen(
         self,
-        from_origins: bool = True
+        from_origins: bool = True,
+        exclude_self: bool = True,
+        check_df_vars: bool = True
         ):
 
         interaction_matrix_df = self.interaction_matrix_df
 
+        if exclude_self:
+
+            interaction_matrix_df = interaction_matrix_df[interaction_matrix_df["i"] != interaction_matrix_df["j"]]
+
         if from_origins:
 
-            if interaction_matrix_df["U_ij"].isna().all():
-                self.utility()
+            if "U_ij" not in interaction_matrix_df.columns or interaction_matrix_df["U_ij"].isna().all():
+                self.utility(check_df_vars = check_df_vars)
                 interaction_matrix_df = self.interaction_matrix_df
 
             hansen_df = pd.DataFrame(interaction_matrix_df.groupby("i")["U_ij"].sum()).reset_index()

{huff-1.5.4 → huff-1.5.5}/huff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.5.4
+Version: 1.5.5
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -18,10 +18,10 @@ 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.4
+## Updates v1.5.5
 - Bugfixes:
-  - Use of check_vars() is now optional (default: True)
-  - Correction of args argument when calling minimize() in huff_ml_fit() 
+  - Removing i = j cases in InteractionMatrix.hansen()
+  - InteractionMatrix.utility(): Check for utility column 
   
 
 ## Features

{huff-1.5.4 → huff-1.5.5}/setup.py

@@ -7,7 +7,7 @@ def read_README():
     
 setup(
     name='huff',
-    version='1.5.4',
+    version='1.5.5',
     description='huff: Huff Model Market Area Analysis',
     packages=find_packages(include=["huff", "huff.tests"]),
     include_package_data=True,