huff 1.5.1__py3-none-any.whl → 1.5.2__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.1
-# Last update: 2025-07-01 17:10
+# Version:     1.5.2
+# Last update: 2025-07-02 21:09
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -1292,21 +1292,6 @@ class InteractionMatrix:
             print(f"Optimization via {method} algorithm succeeded with parameters: {', '.join(str(round(par, 3)) for par in param_results)}.")
    
         else:
-
-            # param_gamma = None
-            # param_lambda = None
-            
-            # supply_locations_metadata["weighting"][0]["param"] = param_gamma            
-            
-            # if customer_origins_metadata["weighting"][0]["func"] == "logistic":
-                               
-            #     param_lambda2 = None                
-            #     customer_origins_metadata["weighting"][0]["param"][0] = param_lambda
-            #     customer_origins_metadata["weighting"][0]["param"][1] = param_lambda2
-            
-            # else:
-                
-            #     customer_origins_metadata["weighting"][0]["param"] = param_lambda
                 
             print(f"Optimiziation via {method} algorithm failed with error message: '{ml_result.message}'. See https://docs.scipy.org/doc/scipy/reference/generated/scipy.optimize.minimize.html for all available algorithms.")
 
@@ -1316,20 +1301,28 @@ class InteractionMatrix:
         if update_estimates:
 
             if "p_ij_emp" not in self.interaction_matrix_df.columns:
+                
                 self.interaction_matrix_df["p_ij_emp"] = self.interaction_matrix_df["p_ij"]
-                print("Probabilties in interaction matrix are treated as empirical probabilties")
+                
+                print("NOTE: Probabilities in interaction matrix are treated as empirical probabilities")
+                
             else:
-                print("Interaction matrix contains empirical probabilties")
+                
+                print("NOTE: Interaction matrix contains empirical probabilities")
 
             if "E_ij_emp" not in self.interaction_matrix_df.columns:
+                
                 self.interaction_matrix_df["E_ij_emp"] = self.interaction_matrix_df["E_ij"]
-                print("Customer interactions in interaction matrix are treated as empirical interactions")
+                
+                print("NOTE: Customer interactions in interaction matrix are treated as empirical interactions")
+                
             else:
-                print("Interaction matrix contains empirical customer interactions")
+                
+                print("NOTE: Interaction matrix contains empirical customer interactions")
 
             if np.isnan(ml_result.x).any():
 
-                print("No update of estimates because fit parameters contain NaN")
+                print("WARNING: No update of estimates because fit parameters contain NaN")
 
                 update_estimates = False
 
@@ -1391,7 +1384,7 @@ class InteractionMatrix:
      
         if "transport_costs" not in interaction_matrix_metadata:
             
-            print("New destination(s) included. No transport costs calculation because not defined in original interaction matrix.")
+            print("WARNING: New destination(s) included. No transport costs calculation because not defined in original interaction matrix.")
             
             interaction_matrix_df = pd.concat(
                 [
@@ -1625,7 +1618,6 @@ class HuffModel:
                 print ("Goodness-of-fit for " + interaction_matrix_metadata["fit"]["fit_by"])
                         
                 print("Sum of squared residuals       ", round(huff_modelfit[1]["SQR"], 2))
-                print("Sum of squares                 ", round(huff_modelfit[1]["SQT"], 2))
                 print("R-squared                      ", round(huff_modelfit[1]["Rsq"], 2))
                 print("Mean squared error             ", round(huff_modelfit[1]["MSE"], 2))
                 print("Root mean squared error        ", round(huff_modelfit[1]["RMSE"], 2))
@@ -1853,7 +1845,8 @@ class HuffModel:
         bounds: list = [(0.5, 1), (-3, -1)],        
         constraints: list = [],
         fit_by = "probabilities",
-        update_estimates: bool = True
+        update_estimates: bool = True,
+        check_numbers: bool = True
         ):
         
         if fit_by in ["probabilities", "flows"]:
@@ -1869,6 +1862,16 @@ class HuffModel:
         
         elif fit_by == "totals":
             
+            if check_numbers:
+                
+                market_areas_df = self.market_areas_df
+                interaction_matrix_df = self.get_interaction_matrix_df()
+                T_j_market_areas_df = sum(market_areas_df["T_j"])
+                T_j_interaction_matrix_df = sum(interaction_matrix_df["E_ij"])
+                
+                if T_j_market_areas_df != T_j_interaction_matrix_df:
+                    print("WARNING: Sum of total market areas (" + str(int(T_j_market_areas_df)) + ") is not equal to sum of customer flows (" + str(int(T_j_interaction_matrix_df)) + ")")
+            
             supply_locations = self.interaction_matrix.supply_locations
             supply_locations_metadata = supply_locations.get_metadata()
         
@@ -1986,12 +1989,13 @@ class HuffModel:
                     update_estimates = False
 
                 else:
-
+                                       
                     self.interaction_matrix.utility()
                     self.interaction_matrix.probabilities()
-                    self.interaction_matrix.flows()
+                    self.interaction_matrix.flows()                    
                     
-                    self.interaction_matrix.marketareas()
+                    huff_model_new_marketareas = self.interaction_matrix.marketareas()
+                    self.market_areas_df["T_j"] = huff_model_new_marketareas.get_market_areas_df()["T_j"]
             
             self.interaction_matrix.metadata["fit"] = {
                 "function": "huff_ml_fit",
@@ -2042,12 +2046,12 @@ class HuffModel:
                     
                 except:
                     
-                    print("Goodness-of-fit metrics could not be calculated due to NaN values.")
+                    print("WARNING: Goodness-of-fit metrics could not be calculated due to NaN values.")
                     return None
             
             else:
                 
-                print("Goodness-of-fit metrics could not be calculated. No empirical values of probabilities in interaction matrix.")
+                print("WARNING: Goodness-of-fit metrics could not be calculated. No empirical values of probabilities in interaction matrix.")
 
                 return None
             
@@ -2069,12 +2073,12 @@ class HuffModel:
                     
                 except:
                     
-                    print("Goodness-of-fit metrics could not be calculated due to NaN values.")
+                    print("WARNING: Goodness-of-fit metrics could not be calculated due to NaN values.")
                     return None
             
             else:
                 
-                print("Goodness-of-fit metrics could not be calculated. No empirical values of customer flows in interaction matrix.")
+                print("WARNING: Goodness-of-fit metrics could not be calculated. No empirical values of customer flows in interaction matrix.")
 
                 return None
             
@@ -2095,12 +2099,12 @@ class HuffModel:
                     
                 except:
                     
-                    print("Goodness-of-fit metrics could not be calculated due to NaN values.")
+                    print("WARNING: Goodness-of-fit metrics could not be calculated due to NaN values.")
                     return None
                 
             else:
                 
-                print("Goodness-of-fit metrics could not be calculated. No empirical values of T_j in market areas data.")
+                print("WARNING: Goodness-of-fit metrics could not be calculated. No empirical values of T_j in market areas data.")
 
                 return None
 
@@ -2174,7 +2178,7 @@ class MCIModel:
                 
             except:
                 
-                print("Goodness-of-fit metrics could not be calculated due to NaN values.")
+                print("WARNING: Goodness-of-fit metrics could not be calculated due to NaN values.")
                 return None
         
         else:
@@ -2224,7 +2228,6 @@ class MCIModel:
             print ("Goodness-of-fit for probabilities")
                     
             print("Sum of squared residuals       ", round(mci_modelfit[1]["SQR"], 2))
-            print("Sum of squares                 ", round(mci_modelfit[1]["SQT"], 2))
             print("R-squared                      ", round(mci_modelfit[1]["Rsq"], 2))
             print("Mean squared error             ", round(mci_modelfit[1]["MSE"], 2))
             print("Root mean squared error        ", round(mci_modelfit[1]["RMSE"], 2))
@@ -3129,7 +3132,7 @@ def modelfit(
 
         if len(obs_exp_clean) < len(observed) or len(obs_exp_clean) < len(expected):
             if verbose:
-                print("Vectors 'observed' and/or 'expected' contain zeros which are dropped.")
+                print("NOTE: Vectors 'observed' and/or 'expected' contain zeros which are dropped.")
         
         observed = obs_exp_clean["observed"].to_numpy()
         expected = obs_exp_clean["expected"].to_numpy()

huff/tests/tests_huff.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.5.1
-# Last update: 2025-07-01 17:10
+# Version:     1.5.2
+# Last update: 2025-07-02 21:10
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -354,6 +354,9 @@ huff_model_fit3 = huff_model_fit2.ml_fit(
 huff_model_fit3.summary()
 # Show summary
 
+print(huff_model_fit3.get_market_areas_df())
+# Show market areas df
+
 
 # Buffer analysis:
 

{huff-1.5.1.dist-info → huff-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.5.1
+Version: 1.5.2
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -28,14 +28,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.1
-- Extensions:
-  - HuffModel.ml_fit(): Fit Huff model parameters by empirical total market areas
-  - HuffModel.summary(): Goodnes-of-fit depends on fit_by
-  - load_market_areas(): Loading table with totals and including into InteractionMatrix, HuffModel and MCIModel objects
+## Updates v1.5.2
 - Bugfixes:
-  - InteractionMatrix.summary(): NoneType parameter
-  - InteractionMatrix.huff_ml_fit(): Update estimates possible even if fit algorithm did not converge
+  - HuffModel.ml_fit(): Correct values of expected T_j, corrected calculation of model fit metrices when fit_by="totals"
+  - HuffModel.ml_fit(): Check if sum of E_ij != sum of T_j
   
 
 ## Features
@@ -44,7 +40,7 @@ See the /tests directory for usage examples of most of the included functions.
   - Defining origins and destinations with weightings
   - Creating interaction matrix from origins and destinations
   - Different function types: power, exponential, logistic
-  - Huff model parameter estimation via Maximum Likelihood (ML) by probalities and customer flows
+  - Huff model parameter estimation via Maximum Likelihood (ML) by probalities, customer flows, and total market areas
   - Huff model market simulation
 - **Multiplicative Competitive Interaction Model**: 
   - Log-centering transformation of interaction matrix

{huff-1.5.1.dist-info → huff-1.5.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 huff/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 huff/gistools.py,sha256=fgeE1IsUO7UIaawb23kuiz_Rlxn7T18iLLTA5yvgp74,7038
-huff/models.py,sha256=IihaZmutJjdKqzTVXGVmcYbauFJImF-UPsZ2QCPzw8s,125182
+huff/models.py,sha256=e8aILi45qcJ9tvHJfKIFKWfD-DYXjZQ0gXOS4MpG7Ks,125430
 huff/ors.py,sha256=JlO2UEishQX87PIiktksOrVT5QdB-GEWgjXcxoR_KuA,11929
 huff/osm.py,sha256=9A-7hxeZyjA2r8w2_IqqwH14qq2Y9AS1GxVKOD7utqs,7747
 huff/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-huff/tests/tests_huff.py,sha256=eHnEiV8m7TjpAXnJqo1aZ0YlQCGHxK1iFXROEyhN5cU,12884
+huff/tests/tests_huff.py,sha256=xHCR087rqLNWDFfZhi1giKDzffCx3IemWQmHrAUYxFw,12956
 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
@@ -23,8 +23,8 @@ huff/tests/data/Haslach_supermarkets.prj,sha256=2Jy1Vlzh7UxQ1MXpZ9UYLs2SxfrObj2x
 huff/tests/data/Haslach_supermarkets.qmd,sha256=JlcOYzG4vI1NH1IuOpxwIPnJsCyC-pDRAI00TzEvNf0,2522
 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=jUt9YcRrYL99AjxzXKMXD3o5erjd9r_jYfnALdrTQ3o,24333
-huff-1.5.1.dist-info/METADATA,sha256=BXRKyUp5qIEoYjNpo_w9zpUwMTDTO_aegNgr67qj8ns,6187
-huff-1.5.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-huff-1.5.1.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
-huff-1.5.1.dist-info/RECORD,,
+huff/tests/data/Wieland2015.xlsx,sha256=H4rxCFlctn44-O6mIyeFf67FlgvznLX7xZqpoWYS41A,25788
+huff-1.5.2.dist-info/METADATA,sha256=XnlmcfscK8c1P3EN40W8JcQnFE7AkWDT4NqLR9skTIY,5956
+huff-1.5.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+huff-1.5.2.dist-info/top_level.txt,sha256=nlzX-PxZNFmIxANIJMySuIFPihd6qOBkRlhIC28NEsQ,5
+huff-1.5.2.dist-info/RECORD,,