Skip to content

Commit

Permalink
Merge pull request #5675 from jbrockmendel/ecln
Browse files Browse the repository at this point in the history
CLN: strict linting for emplike/tests
  • Loading branch information
bashtage committed May 10, 2019
2 parents 34021b5 + bccf544 commit c73dcb8
Show file tree
Hide file tree
Showing 7 changed files with 300 additions and 295 deletions.
1 change: 1 addition & 0 deletions lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if [ "$LINT" == true ]; then
statsmodels/gam/ \
statsmodels/genmod/tests/results/test_R_var_weight.py \
statsmodels/graphics/tsaplots.py \
statsmodels/emplike/tests/ \
statsmodels/examples/tests/ \
statsmodels/iolib/smpickle.py \
statsmodels/iolib/tests/test_pickle.py \
Expand Down
1 change: 0 additions & 1 deletion statsmodels/emplike/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
#init file
564 changes: 282 additions & 282 deletions statsmodels/emplike/tests/results/el_results.py

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions statsmodels/emplike/tests/test_anova.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from statsmodels.emplike.elanova import ANOVA
from .results.el_results import ANOVAResults


class TestANOVA(object):
"""
Tests ANOVA difference in means
Expand Down
4 changes: 2 additions & 2 deletions statsmodels/emplike/tests/test_descriptive.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def test_mv_test_mean(self):

def test_mv_test_mean_weights(self):
assert_almost_equal(self.mvres1.mv_test_mean(np.array([14, 56]),
return_weights=1)[2],
self.res2.mv_test_mean_wts, 4)
return_weights=1)[2],
self.res2.mv_test_mean_wts, 4)

def test_test_skew(self):
assert_almost_equal(self.res1.test_skew(0),
Expand Down
11 changes: 7 additions & 4 deletions statsmodels/emplike/tests/test_origin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from .results.el_results import OriginResults
import numpy as np


class GenRes(object):
"""
Loads data and creates class instance ot be tested.
Expand All @@ -29,14 +30,16 @@ def test_llf(self):
assert_almost_equal(self.res1.llf_el, self.res2.test_llf_hat, 4)

def test_hypothesis_beta1(self):
assert_almost_equal(self.res1.el_test([.0034],[1])[0],
self.res2.test_llf_hypoth,4)
assert_almost_equal(self.res1.el_test([.0034], [1])[0],
self.res2.test_llf_hypoth, 4)

def test_ci_beta(self):
ci = self.res1.conf_int_el(1)
ll = ci[0]
ul = ci[1]
llf_low = np.sum(np.log(self.res1.el_test([ll],[1], return_weights=1)[2]))
llf_high = np.sum(np.log(self.res1.el_test([ul],[1], return_weights=1)[2]))
llf_low = np.sum(np.log(self.res1.el_test([ll], [1],
return_weights=1)[2]))
llf_high = np.sum(np.log(self.res1.el_test([ul], [1],
return_weights=1)[2]))
assert_almost_equal(llf_low, self.res2.test_llf_conf, 4)
assert_almost_equal(llf_high, self.res2.test_llf_conf, 4)
13 changes: 7 additions & 6 deletions statsmodels/emplike/tests/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def test_ci_beta1(self):

def test_ci_beta2(self):
beta2ci = self.res1.conf_int_el(2, lower_bound=.59,
upper_bound=2.2, method='powell')
upper_bound=2.2, method='powell')
assert_almost_equal(beta2ci, self.res2.test_ci_beta2, 5)

def test_ci_beta3(self):
Expand All @@ -99,27 +99,27 @@ class TestRegressionNM(GenRes):

def test_hypothesis_beta0(self):
beta0res = self.res1.el_test([-30], [0], return_weights=1,
method='nm')
method='nm')
assert_almost_equal(beta0res[:2], self.res2.test_beta0[:2], 4)
assert_almost_equal(beta0res[2], self.res2.test_beta0[2], 4)

def test_hypothesis_beta1(self):
beta1res = self.res1.el_test([.5], [1], return_weights=1,
method='nm')
method='nm')
assert_almost_equal(beta1res[:2], self.res2.test_beta1[:2], 4)
assert_almost_equal(beta1res[2], self.res2.test_beta1[2], 4)

@pytest.mark.slow
def test_hypothesis_beta2(self):
beta2res = self.res1.el_test([1], [2], return_weights=1,
method='nm')
method='nm')
assert_almost_equal(beta2res[:2], self.res2.test_beta2[:2], 4)
assert_almost_equal(beta2res[2], self.res2.test_beta2[2], 4)

@pytest.mark.slow
def test_hypothesis_beta3(self):
beta3res = self.res1.el_test([0], [3], return_weights=1,
method='nm')
method='nm')
assert_almost_equal(beta3res[:2], self.res2.test_beta3[:2], 4)
assert_almost_equal(beta3res[2], self.res2.test_beta3[2], 4)

Expand All @@ -146,7 +146,8 @@ def test_ci_beta1(self):

@pytest.mark.slow
def test_ci_beta2(self):
beta2ci = self.res1.conf_int_el(2, lower_bound=.59, upper_bound=2.2, method='nm')
beta2ci = self.res1.conf_int_el(2, lower_bound=.59, upper_bound=2.2,
method='nm')
assert_almost_equal(beta2ci, self.res2.test_ci_beta2, 6)

@pytest.mark.slow
Expand Down

0 comments on commit c73dcb8

Please sign in to comment.