Commit 316fbebc authored by smoretti's avatar smoretti
Browse files

Update Alexandra's WriteResults.cpp

git-svn-id: https://svn.vital-it.ch/svn/hp2c/trunk/Codeml_Variants/Fastcodeml@7204 95c5a404-1f88-0410-a6b0-c3f062b6f34a
parent 649e9783
......@@ -4,7 +4,7 @@
#include <fstream>
#include <limits>
#include "WriteResults.h"
#include <string>
#include <string>
void WriteResults::outputResults(void)
{
......@@ -13,7 +13,7 @@ void WriteResults::outputResults(void)
// Range of branches to be output (for H0 and H1)
std::map<size_t, double>::const_iterator im;
std::map<size_t, std::string>::const_iterator ims;
std::map<size_t, std::string>::const_iterator ims;
size_t min_branch = std::numeric_limits<size_t>::max();
size_t max_branch = 0;
......@@ -55,10 +55,9 @@ void WriteResults::outputResults(void)
else
{
out << std::setw(22) << std::setprecision(15) << std::fixed << im->second;
ims = mParamStr[0].find(branch);
out << std::endl<< std::fixed <<"Branch lengths:" << ims->second << std::endl;
ims = mParamStr[0].find(branch);
out << std::endl<< std::fixed <<"Branch lengths:" << ims->second << std::endl;
}
out << " LnL1: ";
......@@ -71,9 +70,9 @@ void WriteResults::outputResults(void)
else
{
out << std::setw(22) << std::setprecision(15) << std::fixed << im->second;
ims = mParamStr[1].find(branch);
out << std::endl<< std::fixed <<"Branch lengths:" << ims->second << std::endl;
ims = mParamStr[1].find(branch);
out << std::endl<< std::fixed <<"Branch lengths:" <<ims->second << std::endl;
}
out << std::endl;
}
......@@ -138,8 +137,8 @@ void WriteResults::savePositiveSelSites(size_t aFgBranch, const std::vector<unsi
// Save the positive selection sites and corresponding probabilities for later printing
mPositiveSelSites[aFgBranch] = std::make_pair(aPositiveSelSites, aPositiveSelSitesProb);
}
}
void WriteResults::saveParameters(size_t aFgBranch, std::string& aParamStr, unsigned int aHypothesis)
{
// If no file set, then do nothing
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment