Skip to content

Commit

Permalink
3.1.6 rtol for macos azures, conda-forge
Browse files Browse the repository at this point in the history
  • Loading branch information
horta committed Apr 17, 2019
1 parent 8b09dcc commit 3661c8e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion glimix_core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from . import cov, example, ggp, glmm, gp, lik, link, lmm, mean, random
from ._testit import test

__version__ = "3.1.5"
__version__ = "3.1.6"

__all__ = [
"__version__",
Expand Down
18 changes: 9 additions & 9 deletions glimix_core/lmm/test/test_lmm.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ def fun(x):

res = minimize(fun, [0] * c + [0, 0])
lmm.fit(verbose=False)
assert_allclose(lmm.lml(), -res.fun, rtol=1e-4, atol=1e-6)
assert_allclose(lmm.beta, res.x[:c], rtol=1e-4, atol=1e-6)
assert_allclose(lmm.v0, exp(res.x[c]), rtol=1e-4, atol=1e-6)
assert_allclose(lmm.v1, exp(res.x[c + 1]), rtol=1e-4, atol=1e-6)
assert_allclose(lmm.lml(), -res.fun, rtol=1e-3, atol=1e-6)
assert_allclose(lmm.beta, res.x[:c], rtol=1e-3, atol=1e-6)
assert_allclose(lmm.v0, exp(res.x[c]), rtol=1e-3, atol=1e-6)
assert_allclose(lmm.v1, exp(res.x[c + 1]), rtol=1e-3, atol=1e-6)

lmm = LMM(y, X, QS, restricted=restricted)
beta = random.randn(c)
Expand All @@ -239,9 +239,9 @@ def fun(x):

res = minimize(fun, [0, 0])
lmm.fit(verbose=False)
assert_allclose(lmm.lml(), -res.fun, rtol=1e-4, atol=1e-6)
assert_allclose(lmm.v0, exp(res.x[0]), rtol=1e-4, atol=1e-6)
assert_allclose(lmm.v1, exp(res.x[1]), rtol=1e-4, atol=1e-6)
assert_allclose(lmm.lml(), -res.fun, rtol=1e-3, atol=1e-6)
assert_allclose(lmm.v0, exp(res.x[0]), rtol=1e-3, atol=1e-6)
assert_allclose(lmm.v1, exp(res.x[1]), rtol=1e-3, atol=1e-6)

lmm = LMM(y, X, QS, restricted=restricted)
lmm.beta = random.randn(c)
Expand Down Expand Up @@ -280,8 +280,8 @@ def fun(x):
res = minimize(fun, [0] * c + [0])
lmm.fit(verbose=False)
assert_allclose(lmm.lml(), -res.fun, rtol=1e-5, atol=1e-6)
assert_allclose(lmm.beta, res.x[:c], rtol=1e-4, atol=1e-6)
assert_allclose(lmm.delta, 1 / (1 + exp(-res.x[c])), rtol=1e-4, atol=1e-6)
assert_allclose(lmm.beta, res.x[:c], rtol=1e-3, atol=1e-6)
assert_allclose(lmm.delta, 1 / (1 + exp(-res.x[c])), rtol=1e-3, atol=1e-6)


def _get_mvn(y, X, G):
Expand Down

0 comments on commit 3661c8e

Please sign in to comment.