Skip to content

Commit 32fc109

Browse files
author
Stephan Schiffels
committed
fixed bug in initial values of unbounded Cross Coalescence rates
1 parent 4d10ff2 commit 32fc109

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

maximization_step.d

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,16 @@ class MinFunc {
136136
auto lambda1 = lambdaVec[marginalIndex1];
137137
auto lambda2 = lambdaVec[marginalIndex2];
138138
auto lambda12 = lambdaVec[lIndex];
139-
if(lambda12 >= 0.5 * (lambda1 + lambda2))
140-
lambda12 = 0.4999999999 * (lambda1 + lambda2);
139+
if(boundCrossCoal) {
140+
if(lambda12 >= 0.5 * (lambda1 + lambda2))
141+
lambda12 = 0.4999999999 * (lambda1 + lambda2);
142+
}
143+
else {
144+
if(lambda12 < loBoundLambda)
145+
lambda12 = loBoundLambda + 0.000000001;
146+
if(lambda12 > hiBoundLambda)
147+
lambda12 = hiBoundLambda - 0.000000001;
148+
}
141149
ret ~= toScaledCrossLambda(lambda12, lambda1, lambda2);
142150
}
143151
}

0 commit comments

Comments
 (0)