Skip to content

Commit 89d9ee5

Browse files
committed
Set likelihoods to use fixed nodes from prior
1 parent 786cf12 commit 89d9ee5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tsdate/core.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def get_fixed(self, arr, edge):
402402
return arr * liks
403403

404404
def scale_geometric(self, fraction, value):
405-
return value**fraction
405+
return value ** fraction
406406

407407

408408
class LogLikelihoods(Likelihoods):
@@ -686,7 +686,7 @@ def inside_pass(self, *, normalize=True, cache_inside=False, progress=None):
686686
"dangling nodes: please simplify it"
687687
)
688688
daughter_val = self.lik.scale_geometric(
689-
spanfrac, self.lik.make_lower_tri(inside[edge.child])
689+
spanfrac, self.lik.make_lower_tri(inside_values)
690690
)
691691
edge_lik = self.lik.get_inside(daughter_val, edge)
692692
val = self.lik.combine(val, edge_lik)
@@ -1081,8 +1081,6 @@ def get_dates(
10811081
10821082
:return: tuple(mn_post, posterior, timepoints, eps, nodes_to_date)
10831083
"""
1084-
fixed_nodes = set(tree_sequence.samples())
1085-
10861084
# Default to not creating approximate priors unless ts has > 1000 samples
10871085
approx_priors = False
10881086
if tree_sequence.num_samples > 1000:
@@ -1110,6 +1108,8 @@ def get_dates(
11101108
)
11111109
priors = priors
11121110

1111+
fixed_nodes = set(priors.fixed_node_ids())
1112+
11131113
if probability_space != base.LOG:
11141114
liklhd = Likelihoods(
11151115
tree_sequence,

0 commit comments

Comments
 (0)