Gee maint 1528 rebased #1553

Merged
merged 10 commits into from Apr 9, 2014

Projects

None yet

3 participants

@josef-pkt
Member

possible PR for #1314 extras and #1528 rebased on current master

@josef-pkt
Member

unfortunately during cherrypicking one author got switched

@josef-pkt josef-pkt commented on the diff Apr 7, 2014
statsmodels/genmod/dependence_structures/covstruct.py
@@ -131,7 +128,7 @@ def update(self, beta, parent):
ngrp = len(resid)
residsq = np.outer(resid, resid)
- scale += np.diag(residsq).sum()
+ scale += np.trace(residsq)
@josef-pkt
josef-pkt Apr 7, 2014 Member

isn't this just (resid**2).sum()
instead of the nobs_i, nobs_i outer product

@josef-pkt
josef-pkt Apr 7, 2014 Member

ignore this, residsq is used in the next line

@josef-pkt josef-pkt commented on the diff Apr 7, 2014
statsmodels/genmod/generalized_estimating_equations.py
@@ -644,31 +668,29 @@ def predict(self, params, exog=None, offset=None, linear=False):
return fitted
- def _starting_params(self, starting_params):
+ def _starting_params(self):
@josef-pkt
josef-pkt Apr 7, 2014 Member

general candidate for conistent renaming across models start_params
but not consistent in other models either

@josef-pkt josef-pkt commented on the diff Apr 7, 2014
statsmodels/genmod/generalized_estimating_equations.py
Returns:
--------
- beta : array-like
- The input parameter vector beta, expanded to the
+ mean_params : array-like
@josef-pkt
josef-pkt Apr 7, 2014 Member

params_mean postfix ?
another term that we start to see more across models, and haven't settled on a name yet.

@josef-pkt
josef-pkt Apr 7, 2014 Member

no reason to change here again, before we haven't settled on a name

@josef-pkt
Member

rebased again on current master,
should be ready for green button merge when TravisCI reports back.

(The nice thing about isolated imports: I haven't yet recompiled my working checkout for the new cython code, and everything else still works, so far)

@coveralls

Coverage Status

Coverage remained the same when pulling 23ead84 on josef-pkt:gee_maint_1528_rebased into cd7f0d0 on statsmodels:master.

@josef-pkt josef-pkt merged commit bf6639c into statsmodels:master Apr 9, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@josef-pkt
Member

I forgot the commit code in the merge message again
REF/ENH

@josef-pkt josef-pkt added the PR label Apr 14, 2014
@josef-pkt josef-pkt deleted the josef-pkt:gee_maint_1528_rebased branch Jul 10, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment