Skip to content

Commit

Permalink
Merge branch 'release/1.2.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
horta committed Jul 20, 2017
2 parents 98bb8a4 + 750f846 commit 47ee64c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions glimix_core/lmm/lmm.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import division

from numpy import clip, dot, exp
from numpy_sugar import is_all_finite
from numpy import clip, dot, exp, log
from numpy_sugar import epsilon, is_all_finite
from optimix import Function, Scalar, maximize_scalar

from .core import LMMCore
Expand Down Expand Up @@ -118,7 +118,9 @@ def delta(self):

@delta.setter
def delta(self, delta):
delta = clip(delta, epsilon.tiny, 1 - epsilon.tiny)
self._delta = delta
self.variables().set(dict(logistic=log(delta / (1 - delta))))

def copy(self):
# pylint: disable=W0212
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def setup_package():

metadata = dict(
name='glimix-core',
version='1.2.19',
version='1.2.20',
maintainer="Limix Developers",
maintainer_email="horta@ebi.ac.uk",
license="MIT",
Expand Down

0 comments on commit 47ee64c

Please sign in to comment.