unifrac parallelization done, changed dist.seqs output=square to calc all distance...

[mothur.git] / chimera.cpp

diff --git a/chimera.cpp b/chimera.cpp
index 3ab95892b9df8d1ad9692c2bca8b413412d3e0e5..ae9ad9a46ef1ce5634c867219904857731bf3d6e 100644 (file)
--- a/chimera.cpp
+++ b/chimera.cpp
@@ -104,7 +104,7 @@ vector<Sequence*> Chimera::readSeqs(string file) {
                
                #ifdef USE_MPI  
                        int pid, processors;
-                       vector<long> positions;
+                       vector<unsigned long int> positions;
                        int numSeqs;
                        int tag = 2001;
                
@@ -123,7 +123,7 @@ vector<Sequence*> Chimera::readSeqs(string file) {
                        //delete inFileName;
 
                        if (pid == 0) {
-                               positions = setFilePosFasta(file, numSeqs); //fills MPIPos, returns numSeqs
+                               positions = m->setFilePosFasta(file, numSeqs); //fills MPIPos, returns numSeqs
 
                                //send file positions to all processes
                                for(int i = 1; i < processors; i++) { 
@@ -167,14 +167,14 @@ vector<Sequence*> Chimera::readSeqs(string file) {
        #else
 
                ifstream in;
-               openInputFile(file, in);
+               m->openInputFile(file, in);
                
                //read in seqs and store in vector
                while(!in.eof()){
                        
                        if (m->control_pressed) { return container; }
                        
-                       Sequence* current = new Sequence(in);  gobble(in);
+                       Sequence* current = new Sequence(in);  m->gobble(in);
                        
                        if (count == 0) {  length = current->getAligned().length();  count++;  } //gets first seqs length
                        else if (length != current->getAligned().length()) {    unaligned = true;       }
@@ -241,7 +241,7 @@ void Chimera::setMask(string filename) {
        #else
        
                        ifstream infile;
-                       openInputFile(filename, infile);
+                       m->openInputFile(filename, infile);
                        
                        if (!infile.eof()) {
                                Sequence temp(infile);