[beast-mcmc] r6742 committed - Print diagnosis during path sampling when initial likelihood is zero.

[beast...@googlecode.com]

Revision: 6742
Author: bael...@gmail.com
Date: Thu Apr 23 09:52:16 2015 UTC
Log: Print diagnosis during path sampling when initial likelihood is
zero.
https://code.google.com/p/beast-mcmc/source/detail?r=6742

Modified:
/trunk/src/dr/inference/markovchain/MarkovChain.java

=======================================
--- /trunk/src/dr/inference/markovchain/MarkovChain.java Thu Apr 16
14:46:52 2015 UTC
+++ /trunk/src/dr/inference/markovchain/MarkovChain.java Thu Apr 23
09:52:16 2015 UTC
@@ -29,6 +29,7 @@
import dr.inference.model.CompoundLikelihood;
import dr.inference.model.Likelihood;
import dr.inference.model.Model;
+import dr.inference.model.PathLikelihood;
import dr.inference.operators.*;
import dr.inference.prior.Prior;

@@ -138,6 +139,9 @@
String message = "The initial likelihood is zero";
if (likelihood instanceof CompoundLikelihood) {
message += ": " + ((CompoundLikelihood)
likelihood).getDiagnosis();
+ } else if (likelihood instanceof PathLikelihood) {
+ message += ": " + ((CompoundLikelihood)((PathLikelihood)
likelihood).getSourceLikelihood()).getDiagnosis();
+ message += ": " + ((CompoundLikelihood)((PathLikelihood)
likelihood).getDestinationLikelihood()).getDiagnosis();
} else {
message += ".";
}
@@ -254,7 +258,7 @@

if (score == Double.NEGATIVE_INFINITY && mcmcOperator
instanceof GibbsOperator) {
if (!(mcmcOperator instanceof
GibbsIndependentNormalDistributionOperator) && !(mcmcOperator instanceof
GibbsIndependentGammaOperator) && !(mcmcOperator instanceof
GibbsIndependentCoalescentOperator) && !(mcmcOperator instanceof
GibbsIndependentJointNormalGammaOperator)) {
- Logger.getLogger("error").severe("State " +
currentState + ": A Gibbs opertor, " + mcmcOperator.getOperatorName() + ",
returned a state with zero likelihood.");
+ Logger.getLogger("error").severe("State " +
currentState + ": A Gibbs operator, " + mcmcOperator.getOperatorName() + ",
returned a state with zero likelihood.");
}
}