SearchLibrium 0.0.86__tar.gz → 0.0.87__tar.gz

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/PKG-INFO

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

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/pyproject.toml

@@ -59,7 +59,7 @@ Homepage = "https://github.com/zahern/HypothesisX"
 realpython = "SearchLibrium.__main__:main"
 
 [tool.bumpver]
-current_version = "0.0.86"
+current_version = "0.0.87"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "[skip ci] Bump version {old_version} -> {new_version}"
 commit = true

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium/__init__.py

@@ -88,6 +88,7 @@ except ImportError:
 try:
     from ._choice_model import DiscreteChoiceModel
     from .multinomial_logit import MultinomialLogit
+    from .MixedLogit import MixedLogit
     from .multinomial_nested import NestedLogit, MultiLayerNestedLogit
     from .Halton import Halton
     from .rrm import RandomRegret
@@ -107,6 +108,7 @@ try:
 except ImportError as e:
     from _choice_model import DiscreteChoiceModel
     from multinomial_logit import MultinomialLogit
+    from MixedLogit import MixedLogit
     from multinomial_nested import NestedLogit, MultiLayerNestedLogit
     from Halton import Halton
     from rrm import RandomRegret

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium/multinomial_logit.py

@@ -626,7 +626,7 @@ class MultinomialLogit(DiscreteChoiceModel):
     ''' ---------------------------------------------------------- '''
     ''' Function                                                   '''
     ''' ---------------------------------------------------------- '''
-    def scipy_bfgs_optimization(self, betas, X, y, weights, avail, maxiter, ftol, gtol, jac, return_opg, sklearn=None):
+    def scipy_bfgs_optimization(self, betas, X, y, weights, avail, maxiter, ftol, gtol, jac, return_opg=False, sklearn=None):
     # {
         
 

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium/multinomial_nested.py

@@ -906,7 +906,7 @@ class NestedLogit(MultinomialLogit):
                 V_j = float(V[i, chosen_alt])  # V_{A1}
                 sumPV_g = float(sumPV_per_nest[chosen_nest_name][i])  # Σ_k P(k|A) V_k
                 logS_g = float(logS_per_nest[chosen_nest_name][i])  # ln S_A
-                T_i = float(T[i])
+                T_i = float(T[i, 0])  # T has shape (N,1) due to keepdims=True
 
                 # TERM 1: ( sumPV_g - V_j ) / lambda_g^2
                 term1 = (sumPV_g - V_j) / (lambda_g ** 2)

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium/ordered_logit.py

@@ -296,7 +296,7 @@ class OrderedLogit():
     def find_category(self, values: np.ndarray, thresholds: np.ndarray)->np.ndarray:
     # {
         category = np.digitize(values, thresholds)
-        return category - 1
+        return category
     # Note: Subtract - 1 to convert indexing starting from 1 to indexing starting from 0
     # }
 
@@ -699,7 +699,7 @@ class OrderedLogit():
         self.method = method
 
         if start is None:
-            start = [0] * self.params
+            start = [0] * self.nparams
             value = [1] * (self.J - 2) # These are the deltas
             set_last_elements(start, self.J - 2, value)
 

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium/rrm.py

@@ -206,7 +206,7 @@ class RandomRegret(DiscreteChoiceModel):
 
         X, y, varnames, alts, isvars, transvars, ids, weights, panels, avail = \
             self.set_asarray(X, y, varnames, alts, isvars, transvars, ids, weights, None, avail)
-        self.nb_samples, self.nb_attr = self.X.shape
+        self.nb_samples, self.nb_attr = X.shape
         self.nb_alt = len(set(alts))
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         # CHECK FOR MISTAKES IN DATA
@@ -247,6 +247,13 @@ class RandomRegret(DiscreteChoiceModel):
         self.fixedtransvars = self.transvars
         self.X, self.Xnames = self.setup_design_matrix(self.X)
 
+        # Update nb_samples to reflect per-observation count (after 3D reshape)
+        self.nb_samples = self.N
+        self.nb_attr = self.X.shape[2] if self.X.ndim == 3 else self.X.shape[1]
+        # Convert binary choice indicators (N*J,) to per-obs chosen alt index (N,)
+        y_matrix = self.y.reshape(self.N, self.J)
+        self.y = np.argmax(y_matrix, axis=1).astype(int)
+
 
 
         if self.weights is not None:
@@ -283,6 +290,7 @@ class RandomRegret(DiscreteChoiceModel):
         '''
         self.y = np.zeros((self.nb_samples), dtype=int)
         self.attrs = kwargs.get("varnames", varnames)
+        self.normalize = kwargs.get('normalize', False)
         self.initialise()
 
 

searchlibrium-0.0.87/src/SearchLibrium/version.txt

@@ -0,0 +1 @@
+0.0.87

{searchlibrium-0.0.86 → searchlibrium-0.0.87}/src/SearchLibrium.egg-info/PKG-INFO

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

searchlibrium-0.0.86/src/SearchLibrium/version.txt

@@ -1 +0,0 @@
-0.0.86