Commit 736673e2 authored by mvalle's avatar mvalle
Browse files

Fixed read for specific msa (specie name alone on a line)

git-svn-id: https://svn.vital-it.ch/svn/hp2c/trunk/Codeml_Variants/Fastcodeml@5704 95c5a404-1f88-0410-a6b0-c3f062b6f34a
parent 58c7c0a0
......@@ -114,8 +114,8 @@ void Genes::checkNameCoherence(const std::vector<std::string>& aNames) const
for(; is1 != end1; ++is1)
{
bool found = false;
std::vector<std::string>::const_iterator is2=mDnaSpecies.begin();
const std::vector<std::string>::const_iterator end2=mDnaSpecies.end();
std::vector<std::string>::const_iterator is2(mDnaSpecies.begin());
const std::vector<std::string>::const_iterator end2(mDnaSpecies.end());
for(; is2 != end2; ++is2)
{
if(*is1 == *is2) {found = true; break;}
......
......@@ -61,7 +61,7 @@ void Phylip::loadData(const char* aFilename, std::vector<std::string>& aSpecies,
if(str.empty()) continue;
size_t p1 = str.find_first_not_of(" \t\r");
if(p1 == std::string::npos) continue;
size_t p2 = str.find_first_of(" \t", p1);
size_t p2 = str.find_first_of(" \t\r", p1);
std::string s;
s.assign(str, p1, p2-p1);
......
......@@ -189,6 +189,7 @@ int main(int aRgc, char **aRgv)
// Check root (TBD)
tree.checkRootBranches();
//throw FastCodeMLSuccess();
// If times from file then check for null branch lengths for any leaf
if(cmd.mBranchLengthsFromFile)
......
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