From 9cf20fa6a03f357a65d8b594488f0a0f44a20899 Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Thu, 19 Oct 2023 11:14:11 +0800 Subject: [PATCH] changed year end to 2023 --- src/bayes.c | 2 +- src/command.c | 2 +- src/likelihood.c | 2 +- src/mbbeagle.c | 2 +- src/mcmc.c | 2 +- src/model.c | 23 +++++++++++------------ src/proposal.c | 2 +- src/sumpt.c | 2 +- src/utils.c | 2 +- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/bayes.c b/src/bayes.c index dfcecae..1a58a26 100644 --- a/src/bayes.c +++ b/src/bayes.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/command.c b/src/command.c index 4c27c3a..e4dede2 100644 --- a/src/command.c +++ b/src/command.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/likelihood.c b/src/likelihood.c index da63812..6f2b3fb 100644 --- a/src/likelihood.c +++ b/src/likelihood.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/mbbeagle.c b/src/mbbeagle.c index 1a0c4a6..9a47a58 100644 --- a/src/mbbeagle.c +++ b/src/mbbeagle.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * This file originally contributed by: * diff --git a/src/mcmc.c b/src/mcmc.c index 28d2bcf..d78db4d 100644 --- a/src/mcmc.c +++ b/src/mcmc.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/model.c b/src/model.c index b430db1..cbdfc00 100644 --- a/src/model.c +++ b/src/model.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology @@ -10806,12 +10806,11 @@ int DoStartvalsParm (char *parmName, char *tkn) } if (theTree->isClock == YES && modelParams[theTree->relParts[0]].treeAgePr.prior == fixed) { - if (!strcmp(modelParams[theTree->relParts[0]].clockPr,"Uniform") || - !strcmp(modelParams[theTree->relParts[0]].clockPr,"Birthdeath") || - !strcmp(modelParams[theTree->relParts[0]].clockPr,"Fossilization")) - ; - // We cannot check the consistency of root age and clock rate here because they can be set in any order. Defer this - // check to the CheckModel fxn, called just before starting the chain. + // if (!strcmp(modelParams[theTree->relParts[0]].clockPr,"Uniform") || + // !strcmp(modelParams[theTree->relParts[0]].clockPr,"Birthdeath") || + // !strcmp(modelParams[theTree->relParts[0]].clockPr,"Fossilization")); + // We cannot check the consistency of root age and clock rate here because they can be set in any order. + // Defer this check to the CheckModel fxn, called just before starting the chain. } /* the test will find suitable clock rate and ages of nodes in theTree */ if (theTree->isClock == YES && IsClockSatisfied (theTree,0.001) == NO) @@ -19788,7 +19787,7 @@ int SetModelParams (void) p->printParam = YES; if (FillRelPartsString (p, &partString) == YES) - { + { SafeSprintf(&tempStr, &tempStrSize, "pi(0)%s\tpi(1)%s\trootpi(0)%s\trootpi(1)%s", partString, partString, partString, partString); SafeStrcat (&p->paramHeader, tempStr); if (p->paramId == DIRPI_MIX) @@ -19796,7 +19795,7 @@ int SetModelParams (void) SafeSprintf(&tempStr, &tempStrSize, "\tstatefrmod%s", partString); SafeStrcat (&p->paramHeader, tempStr); } - } + } else { SafeStrcat (&p->paramHeader, "pi(0)\tpi(1)\trootpi(0)\trootpi(1)"); @@ -20323,7 +20322,7 @@ int SetModelParams (void) } else for (i = 0; i < p->nValues; i++) { - sprintf (tempStr, "\tnet_speciation_%d", i+1); + SafeSprintf(&tempStr, &tempStrSize, "\tnet_speciation_%d", i+1); SafeStrcat (&p->paramHeader, tempStr); SafeStrcat (&p->paramHeader, partString); } @@ -20365,7 +20364,7 @@ int SetModelParams (void) } else for (i = 0; i < p->nValues; i++) { - sprintf (tempStr, "\trelative_extinction_%d", i+1); + SafeSprintf(&tempStr, &tempStrSize, "\trelative_extinction_%d", i+1); SafeStrcat (&p->paramHeader, tempStr); SafeStrcat (&p->paramHeader, partString); } @@ -20404,7 +20403,7 @@ int SetModelParams (void) } else for (i = 0; i < p->nValues; i++) { - sprintf (tempStr, "\trelative_fossilization_%d", i+1); + SafeSprintf(&tempStr, &tempStrSize, "\trelative_fossilization_%d", i+1); SafeStrcat (&p->paramHeader, tempStr); SafeStrcat (&p->paramHeader, partString); } diff --git a/src/proposal.c b/src/proposal.c index 006744a..fd711a0 100644 --- a/src/proposal.c +++ b/src/proposal.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/sumpt.c b/src/sumpt.c index 420a586..5337f18 100644 --- a/src/sumpt.c +++ b/src/sumpt.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology diff --git a/src/utils.c b/src/utils.c index 6fc58b6..c591779 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /* * MrBayes 3 * - * (c) 2002-2013 + * (c) 2002-2023 * * John P. Huelsenbeck * Dept. Integrative Biology