X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=groupmap.cpp;h=481fd1decfc4516eb5e1cf618c6b4d40cffbc8a9;hb=f816b683e586575bfe3479760a8afd5ab08e8573;hp=8d0662f9c404cb05d4cfed74596a33284d5235d9;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/groupmap.cpp b/groupmap.cpp
index 8d0662f..481fd1d 100644
--- a/groupmap.cpp
+++ b/groupmap.cpp
@@ -14,7 +14,7 @@
  GroupMap::GroupMap(string filename) {
 	m = MothurOut::getInstance();
 	groupFileName = filename;
-	openInputFile(filename, fileHandle);
+	m->openInputFile(filename, fileHandle);
 	index = 0;
 }
 
@@ -25,11 +25,13 @@
 int GroupMap::readMap() {
 		string seqName, seqGroup;
 		int error = 0;
-	
+
 		while(fileHandle){
-			fileHandle >> seqName;			//read from first column
+			fileHandle >> seqName;	m->gobble(fileHandle);		//read from first column
 			fileHandle >> seqGroup;			//read from second column
 			
+			if (m->control_pressed) {  fileHandle.close();  return 1; }
+	
 			setNamesOfGroups(seqGroup);
 			
 			it = groupmap.find(seqName);
@@ -39,11 +41,39 @@ int GroupMap::readMap() {
 				groupmap[seqName] = seqGroup;	//store data in map
 				seqsPerGroup[seqGroup]++;  //increment number of seqs in that group
 			}
-			gobble(fileHandle);
+			m->gobble(fileHandle);
+		}
+		fileHandle.close();
+		m->setAllGroups(namesOfGroups);
+		return error;
+}
+/************************************************************/
+int GroupMap::readDesignMap() {
+		string seqName, seqGroup;
+		int error = 0;
+
+		while(fileHandle){
+			fileHandle >> seqName;	m->gobble(fileHandle);		//read from first column
+			fileHandle >> seqGroup;			//read from second column
+			
+			if (m->control_pressed) {  fileHandle.close();  return 1; }
+	
+			setNamesOfGroups(seqGroup);
+			
+			it = groupmap.find(seqName);
+			
+			if (it != groupmap.end()) { error = 1; m->mothurOut("Your designfile contains more than 1 group named " + seqName + ", group names must be unique. Please correct."); m->mothurOutEndLine();  }
+			else {
+				groupmap[seqName] = seqGroup;	//store data in map
+				seqsPerGroup[seqGroup]++;  //increment number of seqs in that group
+			}
+			m->gobble(fileHandle);
 		}
 		fileHandle.close();
+		m->setAllGroups(namesOfGroups);
 		return error;
 }
+
 /************************************************************/
 int GroupMap::getNumGroups() { return namesOfGroups.size();	}
 /************************************************************/
@@ -59,26 +89,36 @@ string GroupMap::getGroup(string sequenceName) {
 }
 
 /************************************************************/
+
 void GroupMap::setGroup(string sequenceName, string groupN) {
-	groupmap[sequenceName] = groupN;
+	setNamesOfGroups(groupN);
+	
+	it = groupmap.find(sequenceName);
+	
+	if (it != groupmap.end()) {  m->mothurOut("Your groupfile contains more than 1 sequence named " + sequenceName + ", sequence names must be unique. Please correct."); m->mothurOutEndLine();  }
+	else {
+		groupmap[sequenceName] = groupN;	//store data in map
+		seqsPerGroup[groupN]++;  //increment number of seqs in that group
+	}
 }
+
 /************************************************************/
 void GroupMap::setNamesOfGroups(string seqGroup) {
-			int i, count;
-			count = 0;
-			for (i=0; i<namesOfGroups.size(); i++) {
-				if (namesOfGroups[i] != seqGroup) {
-					count++; //you have not found this group
-				}else {
-					break; //you already have it
-				}
-			}
-			if (count == namesOfGroups.size()) {
-				namesOfGroups.push_back(seqGroup); //new group
-				seqsPerGroup[seqGroup] = 0;
-				groupIndex[seqGroup] = index;
-				index++;
-			}
+	int i, count;
+	count = 0;
+	for (i=0; i<namesOfGroups.size(); i++) {
+		if (namesOfGroups[i] != seqGroup) {
+			count++; //you have not found this group
+		}else {
+			break; //you already have it
+		}
+	}
+	if (count == namesOfGroups.size()) {
+		namesOfGroups.push_back(seqGroup); //new group
+		seqsPerGroup[seqGroup] = 0;
+		groupIndex[seqGroup] = index;
+		index++;
+	}
 }
 /************************************************************/
 bool GroupMap::isValidGroup(string groupname) {
@@ -131,4 +171,25 @@ vector<string> GroupMap::getNamesSeqs(){
 	}
 }
 /************************************************************/
+vector<string> GroupMap::getNamesSeqs(vector<string> picked){
+	try {
+		
+		vector<string> names;
+		
+		for (it = groupmap.begin(); it != groupmap.end(); it++) {
+			//if you are belong to one the the groups in the picked vector add you
+			if (m->inUsersGroups(it->second, picked)) {
+				names.push_back(it->first);
+			}
+		}
+		
+		return names;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "GroupMap", "getNamesSeqs");
+		exit(1);
+	}
+}
+
+/************************************************************/