huff 1.3.1__tar.gz → 1.3.3__tar.gz

{huff-1.3.1 → huff-1.3.3}/PKG-INFO

@@ -1,10 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: huff
-Version: 1.3.1
+Version: 1.3.3
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
 Description-Content-Type: text/markdown
+Requires-Dist: geopandas
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: statsmodels
+Requires-Dist: shapely
+Requires-Dist: requests
+Requires-Dist: matplotlib
+Requires-Dist: pillow
+Requires-Dist: contextily
+Requires-Dist: openpyxl
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: summary
 
 # huff: Huff Model Market Area Analysis
 
@@ -39,6 +55,7 @@ See the /tests directory for usage examples of most of the included functions.
     - Spatial join with with statistics
     - Creating euclidean distance matrix from origins and destinations
     - Overlay-difference analysis of polygons
+    - Hansen accessibility
 - **Data management tools**: 
   - Loading own interaction matrix for analysis
   - Creating origins/destinations objects from point geodata

{huff-1.3.1 → huff-1.3.3}/README.md

@@ -31,6 +31,7 @@ See the /tests directory for usage examples of most of the included functions.
     - Spatial join with with statistics
     - Creating euclidean distance matrix from origins and destinations
     - Overlay-difference analysis of polygons
+    - Hansen accessibility
 - **Data management tools**: 
   - Loading own interaction matrix for analysis
   - Creating origins/destinations objects from point geodata

{huff-1.3.1 → huff-1.3.3}/huff/gistools.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.3.1
-# Last update: 2025-05-28 18:01
+# Version:     1.3.3
+# Last update: 2025-06-01 14:30
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.3.1 → huff-1.3.3}/huff/models.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.3.1
-# Last update: 2025-05-28 18:01
+# Version:     1.3.3
+# Last update: 2025-06-01 14:29
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -62,7 +62,7 @@ class CustomerOrigins:
 
         metadata = self.metadata
 
-        print("Huff Model Customer Origins")
+        print("Customer Origins")
         print("No. locations              " + str(metadata["no_points"]))
         
         if metadata["marketsize_col"] is None:
@@ -230,11 +230,8 @@ class SupplyLocations:
 
         metadata = self.metadata
 
-        print("Huff Model Supply Locations")
+        print("Supply Locations")
         print("No. locations         " + str(metadata["no_points"]))
-
-        if metadata["attraction_col"][0] is None or metadata["attraction_col"] == []:
-            print("Attraction column(s)  not defined")
         else:
             print("Attraction column(s)  " + ",".join(metadata["attraction_col"]))
         
@@ -443,7 +440,7 @@ class InteractionMatrix:
         customer_origins_metadata = self.get_customer_origins().get_metadata()
         supply_locations_metadata = self.get_supply_locations().get_metadata()
 
-        print("Huff Model Interaction Matrix")
+        print("Interaction Matrix")
         print("----------------------------------")
         print("Supply locations   " + str(supply_locations_metadata["no_points"]))
         if supply_locations_metadata["attraction_col"][0] is None:
@@ -659,7 +656,7 @@ class InteractionMatrix:
 
         return self
 
-    def marketareas (self):
+    def marketareas(self):
 
         interaction_matrix_df = self.interaction_matrix_df
         
@@ -679,6 +676,27 @@ class InteractionMatrix:
         
         return huff_model
 
+
+    def hansen(
+        self,
+        from_origins: bool = True
+        ):
+
+        interaction_matrix_df = self.interaction_matrix_df
+
+        if interaction_matrix_df["U_ij"].isna().all():
+            self.utility()
+            interaction_matrix_df = self.interaction_matrix_df
+        
+        if from_origins:
+            hansen_df = pd.DataFrame(interaction_matrix_df.groupby("i")["U_ij"].sum()).reset_index()
+            hansen_df = hansen_df.rename(columns = {"U_ij": "A_i"})
+        else:
+            hansen_df = pd.DataFrame(interaction_matrix_df.groupby("j")["U_ij"].sum()).reset_index()
+            hansen_df = hansen_df.rename(columns = {"U_ij": "A_j"})
+
+        return hansen_df
+
     def mci_transformation(
         self,
         cols: list = ["A_j", "t_ij"]

{huff-1.3.1 → huff-1.3.3}/huff/ors.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.3.1
-# Last update: 2025-05-28 18:01
+# Version:     1.3.3
+# Last update: 2025-06-01 14:30
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.3.1 → huff-1.3.3}/huff/osm.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.3.1
-# Last update: 2025-05-28 18:01
+# Version:     1.3.3
+# Last update: 2025-06-01 14:30
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.3.1 → huff-1.3.3}/huff/tests/tests_huff.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.3.1
-# Last update: 2025-05-28 13:10
+# Version:     1.3.2
+# Last update: 2025-05-30 09:37
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -102,6 +102,19 @@ interaction_matrix = haslach_interactionmatrix.transport_costs(
 # Obtaining transport costs (default: driving-car)
 # ORS API documentation: https://openrouteservice.org/dev/#/api-docs/v2/
 
+interaction_matrix.summary()
+# Summary of interaction matrix
+
+print(interaction_matrix.hansen())
+# Hansen accessibility for interaction matrix
+
+interaction_matrix = interaction_matrix.flows()
+# Calculating spatial flows for interaction matrix
+
+huff_model = interaction_matrix.marketareas()
+# Calculating total market areas for interaction matrix
+# Result of class HuffModel
+
 interaction_matrix = interaction_matrix.flows()
 # Calculating spatial flows
 

{huff-1.3.1 → huff-1.3.3}/huff.egg-info/PKG-INFO

@@ -1,10 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: huff
-Version: 1.3.1
+Version: 1.3.3
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
 Description-Content-Type: text/markdown
+Requires-Dist: geopandas
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: statsmodels
+Requires-Dist: shapely
+Requires-Dist: requests
+Requires-Dist: matplotlib
+Requires-Dist: pillow
+Requires-Dist: contextily
+Requires-Dist: openpyxl
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: summary
 
 # huff: Huff Model Market Area Analysis
 
@@ -39,6 +55,7 @@ See the /tests directory for usage examples of most of the included functions.
     - Spatial join with with statistics
     - Creating euclidean distance matrix from origins and destinations
     - Overlay-difference analysis of polygons
+    - Hansen accessibility
 - **Data management tools**: 
   - Loading own interaction matrix for analysis
   - Creating origins/destinations objects from point geodata

{huff-1.3.1 → huff-1.3.3}/setup.py

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