Skip to content

Commit

Permalink
Merge branch 'master' of github.com:BioPP/testnh
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Y. Dutheil committed Feb 22, 2024
2 parents d4756ad + 81f4874 commit c38eb75
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion TestNH/MapNH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ int main(int args, char** argv)

// specific parameters to the null models
string nullProcessParams = ApplicationTools::getStringParameter("nullProcessParams", mapnh.getParams(), "", "", false, 1);

// output

string outputDesc = ApplicationTools::getStringParameter("output.counts", mapnh.getParams(), "PerType(file=counts_)");
Expand Down
6 changes: 3 additions & 3 deletions TestNH/PartNH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ ParameterList getParametersToEstimate(const DRTreeLikelihood* drtl, map<string,
}
catch (ParameterNotFoundException& pnfe)
{
ApplicationTools::displayWarning("Parameter '" + pnfe.getParameter() + "' not found, and so can't be ignored!");
ApplicationTools::displayWarning("Parameter '" + pnfe.parameter() + "' not found, and so can't be ignored!");
}
}

Expand Down Expand Up @@ -804,7 +804,7 @@ int main(int args, char ** argv)
for (size_t j = 0; j < idsk.size(); ++j) {
paramFile << idsk[j];
for (size_t i = 0; i < paramNames.size(); ++i) {
paramFile << "\t" << pl.getParameter(paramNames[i]).getValue();
paramFile << "\t" << pl.parameter(paramNames[i]).getValue();
}
paramFile << endl;
}
Expand All @@ -815,7 +815,7 @@ int main(int args, char ** argv)
for (size_t j = 0; j < ids.size(); ++j) {
paramFile << ids[j];
for (size_t i = 0; i < paramNames.size(); ++i) {
paramFile << "\t" << pl.getParameter(paramNames[i]).getValue();
paramFile << "\t" << pl.parameter(paramNames[i]).getValue();
}
paramFile << endl;
}
Expand Down

0 comments on commit c38eb75

Please sign in to comment.