moved utilities out of mothur.h and into mothurOut class.

[mothur.git] / kmerdb.cpp

diff --git a/kmerdb.cpp b/kmerdb.cpp
index 7f7f26589cf6a5c8a566393db9ec76939eb7c0a9..29265933d8c22ea32c1f943a877b3b6cf62ccfe0 100644 (file)
--- a/kmerdb.cpp
+++ b/kmerdb.cpp
@@ -48,6 +48,8 @@ KmerDB::KmerDB(string fastaFileName, int kSize) : Database(), kmerSize(kSize) {
 
 }
 /**************************************************************************************************/
+KmerDB::KmerDB() : Database() {}
+/**************************************************************************************************/
 
 KmerDB::~KmerDB(){}
 
@@ -105,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
@@ -154,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;
 
@@ -204,6 +212,7 @@ vector<int> KmerDB::getSequencesWithKmer(int kmer) {
                exit(1);
        }       
 }
+/**************************************************************************************************/
 
 
 /**************************************************************************************************/