huff 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

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.2
+# Last update: 2025-05-30 11:06
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

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.2
+# Last update: 2025-05-30 11:06
 # 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,29 @@ 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
+
+=======
+>>>>>>> e9583d0cd7f349f17f005df0fa75e70160655aa3
     def mci_transformation(
         self,
         cols: list = ["A_j", "t_ij"]

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.2
+# Last update: 2025-05-30 11:07
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

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.2
+# Last update: 2025-05-30 11:07
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

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.dist-info → huff-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: huff
-Version: 1.3.1
+Version: 1.3.2
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -15,6 +15,12 @@ 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
 
@@ -49,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.dist-info → huff-1.3.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 huff/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-huff/gistools.py,sha256=LfMhalPk6rNTQSfT1U9UyJgZP1OWdlnv1MSDfP_c0Ik,6857
-huff/models.py,sha256=xpXBM1rTF_HxW5c7-EELs3-sMXBcYo7-X2kSjKbe12k,60856
-huff/ors.py,sha256=DmzeSYgYekXNposD7PH3Sgw8Jpw3KePYeO8DZMKMhl0,11929
-huff/osm.py,sha256=zYAB3EhijfSl1H5bsGxYnPMd-8t_MDKKXTlzA1XWQ5U,6858
+huff/gistools.py,sha256=Zcckofl4OWueSXZmUHRsbrLvAHZuxeI5Gwh4g7hi2H0,6857
+huff/models.py,sha256=gSVZims_7TvXr-pzUYAP19fnEtHmr0QmT8LFI_LsIVw,61452
+huff/ors.py,sha256=hjLJzBBQUP0frF-Aj8aCkOFVeCHc_3rGkJ8srOYIPOE,11929
+huff/osm.py,sha256=KTJo9NYDNZjDDYp4FKNH0MxMnY9A7kfg12FvCAvpmQw,6858
 huff/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-huff/tests/tests_huff.py,sha256=7C1sIzHVNBD8kv7DJkrUERuxDnNDJUpmqzA1KozQbtk,7207
+huff/tests/tests_huff.py,sha256=iITEaA96WrewlLyC3l8wWPMwVigAgG9OYsHbix7hI0A,7595
 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
@@ -18,7 +18,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=SaVM-Hi5dBTmf2bzszMnZ2Ec8NUE05S_5F2lQj0ayS0,19641
-huff-1.3.1.dist-info/METADATA,sha256=cTxd7O_4ey6N3X-dgVrLhIgiPdJiucQqaSKcGlIfyzw,4530
-huff-1.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-huff-1.3.1.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
-huff-1.3.1.dist-info/RECORD,,
+huff-1.3.2.dist-info/METADATA,sha256=cf90Dvp0NVO4ZoUx1uBT90ahuAmKKHloGd_z4ne4-I8,4697
+huff-1.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+huff-1.3.2.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
+huff-1.3.2.dist-info/RECORD,,

{huff-1.3.1.dist-info → huff-1.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any