Skip to content

Commit

Permalink
REF: return resultswrappers for L1 results
Browse files Browse the repository at this point in the history
  • Loading branch information
josef-pkt committed Oct 6, 2012
1 parent d81fe45 commit ce41a0b
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions statsmodels/discrete/discrete_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ def fit_regularized(self, start_params=None, method='l1',
else:
raise Exception(
"argument method == %s, which is not handled" % method)
return BinaryResultsWrapper(discretefit)
fit_regularized.__doc__ = DiscreteModel.fit.__doc__
return L1BinaryResultsWrapper(discretefit)
fit_regularized.__doc__ = DiscreteModel.fit_regularized.__doc__

def _derivative_predict(self, params, exog=None, transform='dydx'):
"""
Expand Down Expand Up @@ -458,8 +458,8 @@ def fit_regularized(self, start_params=None, method='l1',
size_trim_tol=size_trim_tol, qc_tol=qc_tol, **kwargs)
mnfit.params = mnfit.params.reshape(self.K, -1, order='F')
mnfit = L1MultinomialResults(self, mnfit)
return MultinomialResultsWrapper(mnfit)
fit_regularized.__doc__ = DiscreteModel.fit.__doc__
return L1MultinomialResultsWrapper(mnfit)
fit_regularized.__doc__ = DiscreteModel.fit_regularized.__doc__


def _derivative_predict(self, params, exog=None, transform='dydx'):
Expand Down Expand Up @@ -687,8 +687,8 @@ def fit_regularized(self, start_params=None, method='l1',
else:
raise Exception(
"argument method == %s, which is not handled" % method)
return CountResultsWrapper(discretefit)
fit_regularized.__doc__ = DiscreteModel.fit.__doc__
return L1CountResultsWrapper(discretefit)
fit_regularized.__doc__ = DiscreteModel.fit_regularized.__doc__


class OrderedModel(DiscreteModel):
Expand Down Expand Up @@ -2292,14 +2292,26 @@ class CountResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(CountResultsWrapper, CountResults)

class L1CountResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(L1CountResultsWrapper, L1CountResults)

class BinaryResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(BinaryResultsWrapper, BinaryResults)

class L1BinaryResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(L1BinaryResultsWrapper, L1BinaryResults)

class MultinomialResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(MultinomialResultsWrapper, MultinomialResults)

class L1MultinomialResultsWrapper(lm.RegressionResultsWrapper):
pass
wrap.populate_wrapper(L1MultinomialResultsWrapper, L1MultinomialResults)


if __name__=="__main__":
import numpy as np
Expand Down

0 comments on commit ce41a0b

Please sign in to comment.