Skip to content

Commit 9481921

Browse files
committed
be more explicit about setting the default norm function
1 parent be997cf commit 9481921

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

python/tskit/trees.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11014,12 +11014,14 @@ def hap_norm(X, n, nA, nB):
1101411014
row_sites, col_sites = self.parse_sites(sites)
1101511015
row_positions, col_positions = self.parse_positions(positions)
1101611016
_, sample_sets, sample_set_sizes = self.__convert_sample_sets(sample_sets)
11017+
if norm_f is None:
11018+
# produce the same number of dims as output dimensions with [val] * dim
11019+
norm_f = lambda X, n, nA, nB: [1 / (nA * nB)] * result_dim
1101711020
result = self._ll_tree_sequence.two_locus_count_stat(
1101811021
sample_set_sizes,
1101911022
sample_sets,
1102011023
f,
11021-
# produce the same number of dims as output dimensions
11022-
norm_f or (lambda X, n, nA, nB: [1 / (nA * nB)] * result_dim),
11024+
norm_f,
1102311025
result_dim,
1102411026
polarised,
1102511027
row_sites,

0 commit comments

Comments
 (0)