SearchLibrium 0.0.153__tar.gz → 0.0.154__tar.gz

{searchlibrium-0.0.153/src/SearchLibrium.egg-info → searchlibrium-0.0.154}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.153
+Version: 0.0.154
 Summary: A Python package for econometric models driven by search
 Author: Mario Fernando Taco Morales, Alexander Paz, Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

{searchlibrium-0.0.153 → searchlibrium-0.0.154}/pyproject.toml

@@ -82,7 +82,7 @@ Documentation = "https://pypi.org/project/SearchLibrium/"
 realpython = "SearchLibrium.__main__:main"
 
 [tool.bumpver]
-current_version = "0.0.153"
+current_version = "0.0.154"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "[skip ci] Bump version {old_version} -> {new_version}"
 commit = true

{searchlibrium-0.0.153 → searchlibrium-0.0.154}/src/SearchLibrium/__init__.py

@@ -106,6 +106,7 @@ try:
     from .latent_class import LatentClassMixedLogit
     from .mdcev import MDCEVFitResult, MDCEVModel
     from .multinomial_probit import MultinomialProbit
+    from .MixedLogitGSE import MixedLogitGSE
     from .RandomP import RandomParameters
     from .constraints_builder import ConstraintBuilder, create_constraints
     from .search import Parameters
@@ -131,6 +132,7 @@ except ImportError as e:
     from latent_class import LatentClassMixedLogit
     from mdcev import MDCEVFitResult, MDCEVModel
     from multinomial_probit import MultinomialProbit
+    from MixedLogitGSE import MixedLogitGSE
     from RandomP import RandomParameters
     from constraints_builder import ConstraintBuilder, create_constraints
     from search import Parameters

{searchlibrium-0.0.153 → searchlibrium-0.0.154}/src/SearchLibrium/harmony.py

@@ -949,10 +949,11 @@ class HarmonySearch(Search):
         """Identify groups of variables that measure similar constructs
         and can be substituted for one another."""
         groups = []
-        # Group 1: destination size measures
+        # Group 1: destination size measures (now includes per-type ACDC)
         size_measures = [v for v in asvars
                          if v in {'ln_dest_trips', 'osm_destination_pull',
-                                  'acdc_aggl', 'osm_poi_intensity'}]
+                                  'acdc_aggl', 'osm_poi_intensity'}
+                         or v.startswith('acdc_aggl_')]
         for i in range(len(size_measures)):
             for j in range(i + 1, len(size_measures)):
                 groups.append((size_measures[i], size_measures[j]))
@@ -972,6 +973,25 @@ class HarmonySearch(Search):
             for j in range(i + 1, len(osm_measures)):
                 groups.append((osm_measures[i], osm_measures[j]))
 
+        # Group 4: Per-type ACDC agglomeration terms (substitutable by OSM type)
+        per_type_aggl = [v for v in asvars if v.startswith('acdc_aggl_')]
+        for i in range(len(per_type_aggl)):
+            for j in range(i + 1, len(per_type_aggl)):
+                groups.append((per_type_aggl[i], per_type_aggl[j]))
+
+        # Group 5: Per-type ACDC competition terms (substitutable by OSM type)
+        per_type_comp = [v for v in asvars if v.startswith('acdc_comp_')]
+        for i in range(len(per_type_comp)):
+            for j in range(i + 1, len(per_type_comp)):
+                groups.append((per_type_comp[i], per_type_comp[j]))
+
+        # Group 6: Cross-substitution — agglomeration <-> competition for same type
+        for t in ['retail', 'food', 'leisure', 'parks', 'transit', 'cycleway', 'culture']:
+            aggl_var = f'acdc_aggl_{t}'
+            comp_var = f'acdc_comp_{t}'
+            if aggl_var in asvars and comp_var in asvars:
+                groups.append((aggl_var, comp_var))
+
         return groups
 
     def _get_forced_vars(self):

searchlibrium-0.0.154/src/SearchLibrium/version.txt

@@ -0,0 +1 @@
+0.0.154

{searchlibrium-0.0.153 → searchlibrium-0.0.154/src/SearchLibrium.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SearchLibrium
-Version: 0.0.153
+Version: 0.0.154
 Summary: A Python package for econometric models driven by search
 Author: Mario Fernando Taco Morales, Alexander Paz, Prithvi Beeramole, Robert Burdett
 Author-email: Zeke Ahern <z.ahern@qut.edu.au>

searchlibrium-0.0.153/src/SearchLibrium/version.txt

@@ -1 +0,0 @@
-0.0.153