pca command

[mothur.git] / kmerdb.cpp

diff --git a/kmerdb.cpp b/kmerdb.cpp
index 77d93daf4b6c8cf18a8be546fcd4eb41c0dc7301..108b207d87c469b9f95df83921332b1bf5a756ae 100644 (file)
--- a/kmerdb.cpp
+++ b/kmerdb.cpp
@@ -107,7 +107,10 @@ void KmerDB::generateDB(){
        try {
                
                ofstream kmerFile;                                                                              //      once we have the kmerLocations folder print it out
-               openOutputFile(kmerDBName, kmerFile);                                   //      to a file
+               m->openOutputFile(kmerDBName, kmerFile);                                        //      to a file
+               
+               //output version
+               kmerFile << "#" << m->getVersion() << endl;
                
                for(int i=0;i<maxKmer;i++){                                                             //      step through all of the possible kmer numbers
                        kmerFile << i << ' ' << kmerLocations[i].size();        //      print the kmer number and the number of sequences with
@@ -156,6 +159,9 @@ void KmerDB::readKmerDB(ifstream& kmerDBFile){
                                        
                kmerDBFile.seekg(0);                                                                    //      start at the beginning of the file
                
+               //read version
+               string line = m->getline(kmerDBFile); m->gobble(kmerDBFile);
+               
                string seqName;
                int seqNumber;
 
@@ -206,43 +212,6 @@ vector<int> KmerDB::getSequencesWithKmer(int kmer) {
                exit(1);
        }       
 }
-#ifdef USE_MPI 
-/**************************************************************************************************/
-int KmerDB::MPISend(int receiver) {
-       try {
-               
-               //send kmerSize - int
-               MPI_Send(&kmerSize, 1, MPI_INT, receiver, 2001, MPI_COMM_WORLD); 
-               
-               return 0;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "KmerDB", "MPISend");
-               exit(1);
-       }
-}
-/**************************************************************************************************/
-int KmerDB::MPIRecv(int sender) {
-       try {
-               MPI_Status status;
-               
-               //receive kmerSize - int
-               MPI_Recv(&kmerSize, 1, MPI_INT, sender, 2001, MPI_COMM_WORLD, &status);
-               
-               //set maxKmer 
-               int power4s[14] = { 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864 };
-               count = 0;
-               maxKmer = power4s[kmerSize];
-               kmerLocations.resize(maxKmer+1);
-               
-               return 0;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "KmerDB", "MPIRecv");
-               exit(1);
-       }
-}
-#endif
 /**************************************************************************************************/