Skip to content

Commit

Permalink
bugz
Browse files Browse the repository at this point in the history
  • Loading branch information
dfm committed Nov 25, 2018
1 parent c283f7e commit 28ea42d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 20 deletions.
11 changes: 1 addition & 10 deletions exoplanet/distributions.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,6 @@ def get_joint_r_and_b_distribution(name="", N_planets=None,
be 1.
min_radius (Optional[float]): The minimum allowed radius.
max_radius (Optional[float]): The maximum allowed radius.
r_star (Optional[scalar]): The radius of the star (or a PyMC3 variable
giving the stellar radius). If given, the radius parameter will be
treated as a radius ratio instead of the physical radius.
testval_r (Optional[float or array]): An initial guess for the radius
parameter. This should be a ``float`` or an array with
``N_planets`` entries.
Expand Down Expand Up @@ -249,13 +246,7 @@ def get_joint_r_and_b_distribution(name="", N_planets=None,
shape=(2, N_planets), testval=rb_test, **kwargs)

# Extract the individual components
r = pm.Deterministic(name + "r", rb[0])
b = pm.Deterministic(name + "b", rb[1])

# Determine if the radius parameter is the radius or the radius ratio
if r_star is None:
r = pm.Deterministic(name + "r", rb[0])
else:
ror = pm.Deterministic(name + "ror", rb[0])
r = pm.Deterministic(name + "r", ror * r_star)

return r, b
2 changes: 0 additions & 2 deletions exoplanet/sampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ def warmup(self, start=None, step_kwargs=None, **kwargs):
step_kwargs = {}
step = self.get_step_for_trace(**step_kwargs)
self._extend(self.start, start=start, step=step, **kwargs)
self._current_step = self.get_step_for_trace(self._current_trace,
**step_kwargs)
return self._current_trace

def _get_start_and_step(self, start=None, step_kwargs=None, trace=None,
Expand Down
9 changes: 1 addition & 8 deletions exoplanet/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,8 @@ def eval_in_model(var, point=None, return_func=False, model=None, **kwargs):
if point is None:
point = model.test_point

# Cache the function if it has previously been compiled
if not hasattr(model, "_exoplanet_eval_funcs"):
model._exoplanet_eval_funcs = dict()
kwargs["on_unused_input"] = kwargs.get("on_unused_input", "ignore")
func = model._exoplanet_eval_funcs.get(
var, theano.function(model.vars, var, **kwargs))
model._exoplanet_eval_funcs[var] = func

# Work out the arguments
func = theano.function(model.vars, var, **kwargs)
args = [point[k.name] for k in model.vars]

if return_func:
Expand Down

0 comments on commit 28ea42d

Please sign in to comment.