From fa79a9159ca2dc2e9ce834d0f018ca92a6209f29 Mon Sep 17 00:00:00 2001 From: westcott Date: Fri, 6 Mar 2009 15:40:01 +0000 Subject: [PATCH] got rid of rd_parsimony ext. --- fullmatrix.cpp | 6 +++++- parsimonycommand.cpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fullmatrix.cpp b/fullmatrix.cpp index 6ff9334..3f1344c 100644 --- a/fullmatrix.cpp +++ b/fullmatrix.cpp @@ -14,7 +14,11 @@ //This constructor reads a distance matrix file and stores the data in the matrix. FullMatrix::FullMatrix(ifstream& f) { try{ - f >> numSeqs; + string name; + f >> numSeqs >> name; + + matrix.resize(numSeqs); + } diff --git a/parsimonycommand.cpp b/parsimonycommand.cpp index 633ddad..4b3435e 100644 --- a/parsimonycommand.cpp +++ b/parsimonycommand.cpp @@ -28,8 +28,8 @@ ParsimonyCommand::ParsimonyCommand() { }else { //user wants random distribution savetmap = globaldata->gTreemap; getUserInput(); - parsFile = randomtree + ".rd_parsimony"; - parsFileout = globaldata->getTreeFile() + "temp" + ".rd_parsimony"; + parsFile = randomtree; + parsFileout = globaldata->getTreeFile() + "temp"; } //set users groups to analyze -- 2.39.5