X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=treemap.cpp;h=47b7cf343635e2d104db75114aa77fbe8007c466;hp=42ec336dd53d9da3c0ac44b997cdc7509a89c9cf;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=f687723a8357916e86a05116978e6869b039ce36

diff --git a/treemap.cpp b/treemap.cpp
index 42ec336..47b7cf3 100644
--- a/treemap.cpp
+++ b/treemap.cpp
@@ -13,6 +13,9 @@
 
  TreeMap::TreeMap(string filename) {
 	m = MothurOut::getInstance();
+    ofstream out2;
+    m->openOutputFileAppend(filename, out2);
+    out2 << endl; out2.close();
 	groupFileName = filename;
 	m->openInputFile(filename, fileHandle);
 }
@@ -22,6 +25,10 @@
 /************************************************************/
 int TreeMap::readMap(string gf) {
     try {
+        ofstream out2;
+        m->openOutputFileAppend(gf, out2);
+        out2 << endl; out2.close();
+        
         groupFileName = gf;
         m->openInputFile(gf, fileHandle);
         
@@ -65,6 +72,34 @@ int TreeMap::readMap(string gf) {
         }
         fileHandle.close();
         
+        if (rest != "") {
+            vector<string> pieces = m->splitWhiteSpace(rest);
+            
+            for (int i = 0; i < pieces.size(); i++) {
+                if (columnOne) {  seqName = pieces[i]; columnOne=false; }
+                else  { seqGroup = pieces[i]; pairDone = true; columnOne=true; }
+                
+                if (pairDone) { 
+                    setNamesOfGroups(seqGroup);
+                    
+                    map<string, GroupIndex>::iterator itCheck = treemap.find(seqName);
+                    if (itCheck != treemap.end()) { error = 1; m->mothurOut("[WARNING]: Your groupfile contains more than 1 sequence named " + seqName + ", sequence names must be unique. Please correct."); m->mothurOutEndLine();  }
+                    else {
+                        namesOfSeqs.push_back(seqName);
+                        treemap[seqName].groupname = seqGroup;	//store data in map
+                        
+                        it2 = seqsPerGroup.find(seqGroup);
+                        if (it2 == seqsPerGroup.end()) { //if it's a new group
+                            seqsPerGroup[seqGroup] = 1;
+                        }else {//it's a group we already have
+                            seqsPerGroup[seqGroup]++;
+                        }				
+                    }
+                    pairDone = false; 
+                } 
+            }
+        }
+        
         return error;
     }
 	catch(exception& e) {
@@ -116,6 +151,34 @@ int TreeMap::readMap() {
         }
         fileHandle.close();
         
+        if (rest != "") {
+            vector<string> pieces = m->splitWhiteSpace(rest);
+            
+            for (int i = 0; i < pieces.size(); i++) {
+                if (columnOne) {  seqName = pieces[i]; columnOne=false; }
+                else  { seqGroup = pieces[i]; pairDone = true; columnOne=true; }
+                
+                if (pairDone) { 
+                    setNamesOfGroups(seqGroup);
+                    
+                    map<string, GroupIndex>::iterator itCheck = treemap.find(seqName);
+                    if (itCheck != treemap.end()) { error = 1; m->mothurOut("[WARNING]: Your groupfile contains more than 1 sequence named " + seqName + ", sequence names must be unique. Please correct."); m->mothurOutEndLine();  }
+                    else {
+                        namesOfSeqs.push_back(seqName);
+                        treemap[seqName].groupname = seqGroup;	//store data in map
+                        
+                        it2 = seqsPerGroup.find(seqGroup);
+                        if (it2 == seqsPerGroup.end()) { //if it's a new group
+                            seqsPerGroup[seqGroup] = 1;
+                        }else {//it's a group we already have
+                            seqsPerGroup[seqGroup]++;
+                        }				
+                    }
+                    pairDone = false; 
+                } 
+            }
+        }
+        
         return error;
     }
 	catch(exception& e) {
@@ -183,26 +246,6 @@ string TreeMap::getGroup(string sequenceName) {
 		return "not found";
 	}
 		
-}
-/************************************************************/
-void TreeMap::setIndex(string seq, int index) {
-	it = treemap.find(seq);
-	if (it != treemap.end()) { //sequence name was in group file
-		treemap[seq].vectorIndex = index;	
-	}else {
-		treemap[seq].vectorIndex = index;
-		treemap[seq].groupname = "not found";
-	}
-}
-/************************************************************/
-int TreeMap::getIndex(string seq) {
-	
-	it = treemap.find(seq);
-	// if it is a valid sequence name then return index
-	if (it != treemap.end()) { return treemap[seq].vectorIndex; }
-	// if not return error code
-	else { return -1; }
-	
 }
 /************************************************************/