]> git.donarmstrong.com Git - mothur.git/commitdiff
fixed bug in sequencedb read for windows users and substr error in trim.seqs
authorwestcott <westcott>
Mon, 6 Jul 2009 12:41:02 +0000 (12:41 +0000)
committerwestcott <westcott>
Mon, 6 Jul 2009 12:41:02 +0000 (12:41 +0000)
chimeraseqscommand.cpp
chimeraseqscommand.h
sequencedb.cpp
trimseqscommand.cpp

index b810b9f09fdca369bd5e8e0ccdba830d247eaf37..182c25e4b909ba2dd49fc1971beb7abee3b99188 100644 (file)
@@ -107,9 +107,54 @@ int ChimeraSeqsCommand::execute(){
                
                //find average midpoint of seqs
                midpoint = findAverageMidPoint();
+               
+               //create 2 vectors of sequences, 1 for left side and one for right side
+               vector<Sequence> left;  vector<Sequence> right;
+               
+               for (int i = 0; i < seqs.size(); i++) {
+                       //save left side
+                       string seqLeft = seqs[i].getAligned();
+                       seqLeft = seqLeft.substr(0, midpoint);
+                       Sequence tempLeft(seqs[i].getName(), seqLeft);
+                       left.push_back(tempLeft);
+                       
+                       //save right side
+                       string seqRight = seqs[i].getAligned();
+                       seqRight = seqRight.substr(midpoint+1, (seqRight.length()-midpoint-1));
+                       Sequence tempRight(seqs[i].getName(), seqRight);
+                       right.push_back(tempRight);
+               }
                                
                //this should be parallelized
-               //generatePreferences();
+               //perference = sum of (| distance of my left to sequence j's left - distance of my right to sequence j's right | )
+               //create a matrix containing the distance from left to left and right to right
+               //calculate distances
+               SparseMatrix* SparseLeft = new SparseMatrix();
+               SparseMatrix* SparseRight = new SparseMatrix();
+               
+               createSparseMatrix(0, left.size(), SparseLeft, left);
+               createSparseMatrix(0, right.size(), SparseRight, right);
+               
+               
+               //vector<SeqMap> distMapRight;
+               //vector<SeqMap> distMapLeft;
+               
+               // Create a data structure to quickly access the distance information.
+               // It consists of a vector of distance maps, where each map contains
+               // all distances of a certain sequence. Vector and maps are accessed
+               // via the index of a sequence in the distance matrix
+               //distMapRight = vector<SeqMap>(globaldata->gListVector->size()); 
+               //distMapLeft = vector<SeqMap>(globaldata->gListVector->size()); 
+               for (MatData currentCell = SparseLeft->begin(); currentCell != SparseLeft->end(); currentCell++) {
+                       //distMapLeft[currentCell->row][currentCell->column] = currentCell->dist;
+               }
+               for (MatData currentCell = SparseRight->begin(); currentCell != SparseRight->end(); currentCell++) {
+                       //distMapRight[currentCell->row][currentCell->column] = currentCell->dist;
+               }
+
+               
+               //fill preference structure
+               //generatePreferences(distMapLeft, distMapRight);
                
                                
                //output results to screen                                              
@@ -203,20 +248,22 @@ int ChimeraSeqsCommand::findAverageMidPoint(){
        }
 }
 
-/***************************************************************************************************************
-int ChimeraSeqsCommand::createSparseMatrix(int startLine, int endLine, SparseMatrix* sparse){
+/***************************************************************************************************************/
+int ChimeraSeqsCommand::createSparseMatrix(int startSeq, int endSeq, SparseMatrix* sparse, vector<Sequence> s){
        try {
 
-               for(int i=startLine; i<endLine; i++){
+               for(int i=startSeq; i<endSeq; i++){
                        
                        for(int j=0;j<i;j++){
                        
-                               distCalculator->calcDist(seqs.get(i), seqs.get(j));
-                               double dist = distCalculator->getDist();
-                               
+                               //distCalculator->calcDist(s.get(i), s.get(j));
+                               float dist = distCalculator->getDist();
                                
+                               PCell temp(i, j, dist);
+                               sparse->addCell(temp);
                                
                        }
+               }
                        
        
                return 1;
@@ -226,5 +273,31 @@ int ChimeraSeqsCommand::createSparseMatrix(int startLine, int endLine, SparseMat
                exit(1);
        }
 }
+/***************************************************************************************************************
+void ChimeraSeqsCommand::generatePreferences(vector<SeqMap> left, vector<SeqMap> right){
+       try {
+
+               for (int i = 0; i < left.size(); i++) {
+                       
+                       int iscore = 0;
+                       float closestLeft = 100000.0;
+                       float closestRight = 100000.0;
+                       
+                       for (int j = 0; j < left.size(); j++) {
+                               
+                               //iscore += abs(left
+                       
+                       }
+               
+               }
+
+       }
+       catch(exception& e) {
+               errorOut(e, "ChimeraSeqsCommand", "generatePreferences");
+               exit(1);
+       }
+}
+/**************************************************************************************************/
+
 /**************************************************************************************************/
 
index 455ac926a494d162839444a5e192f9a030556d07..5b55120e0d0981b432f71332dc1db57e8fae5ce7 100644 (file)
 #include "command.hpp"
 #include "filterseqscommand.h"
 #include "sequence.hpp"
+#include "sparsematrix.hpp"
+#include "dist.h"
 
-
+typedef list<PCell>::iterator MatData;
+typedef map<int, float> SeqMap;  //maps sequence to all distance for that seqeunce
 
 /***********************************************************/
 
@@ -36,7 +39,7 @@ private:
 
        };
 
-
+       Dist* distCalculator;
        bool abort;
        string method, fastafile;
        bool filter, correction;
@@ -47,6 +50,8 @@ private:
        
        int findAverageMidPoint();
        void readSeqs();
+       void generatePreferences(SparseMatrix*, SparseMatrix*);
+       int createSparseMatrix(int, int, SparseMatrix*, vector<Sequence>);
        
 
 };
index ca201d5a211695138540fe585314773fe4020f90..32fc14644698ddedb4248aba10ea3ed3415bf7be 100644 (file)
@@ -30,23 +30,11 @@ SequenceDB::SequenceDB(int newSize) {
 
 SequenceDB::SequenceDB(ifstream& filehandle) {
        try{
-               string name, sequence, line;
-               sequence = "";
-               int c;
-               string temp;
-               
-               
+                               
                //read through file
-               while ((c = filehandle.get()) != EOF) {
-                       name = ""; sequence = ""; 
-                       //is this a name
-                       if (c == '>') { 
-                               name = readName(filehandle); 
-                               sequence = readSequence(filehandle); 
-                       }else {  mothurOut("Error fasta in your file. Please correct."); mothurOutEndLine(); }
-
+               while (!filehandle.eof()) {
                        //input sequence info into sequencedb
-                       Sequence newSequence(name, sequence);
+                       Sequence newSequence(filehandle);
                        data.push_back(newSequence);
                        
                        //takes care of white space
index ef0c06649af1afb64458bf153457bdadda566999..937b130deb2c4b2dd6d3e72d191c090b34ee51e5 100644 (file)
@@ -256,263 +256,319 @@ int TrimSeqsCommand::execute(){
 //***************************************************************************************************************
 
 void TrimSeqsCommand::getOligos(vector<ofstream*>& outFASTAVec){
-       
-       ifstream inOligos;
-       openInputFile(oligoFile, inOligos);
-
-       ofstream test;
-       
-       string type, oligo, group;
-       int index=0;
-
-       while(!inOligos.eof()){
-               inOligos >> type;
-
-               if(type[0] == '#'){
-                       while (!inOligos.eof()) {       char c = inOligos.get(); if (c == 10 || c == 13){       break;  }       } // get rest of line if there's any crap there
-               }
-               else{
-                       inOligos >> oligo;
-                       
-                       for(int i=0;i<oligo.length();i++){
-                               oligo[i] = toupper(oligo[i]);
-                               if(oligo[i] == 'U')     {       oligo[i] = 'T'; }
-                       }
+       try {
+               ifstream inOligos;
+               openInputFile(oligoFile, inOligos);
+               
+               ofstream test;
+               
+               string type, oligo, group;
+               int index=0;
+               
+               while(!inOligos.eof()){
+                       inOligos >> type;
                        
-                       if(type == "forward"){
-                               forPrimer.push_back(oligo);
-                       }
-                       else if(type == "reverse"){
-                               revPrimer.push_back(oligo);
+                       if(type[0] == '#'){
+                               while (!inOligos.eof()) {       char c = inOligos.get(); if (c == 10 || c == 13){       break;  }       } // get rest of line if there's any crap there
                        }
-                       else if(type == "barcode"){
-                               inOligos >> group;
-                               barcodes[oligo]=index++;
-                               groupVector.push_back(group);
+                       else{
+                               inOligos >> oligo;
+                               
+                               for(int i=0;i<oligo.length();i++){
+                                       oligo[i] = toupper(oligo[i]);
+                                       if(oligo[i] == 'U')     {       oligo[i] = 'T'; }
+                               }
+                               
+                               if(type == "forward"){
+                                       forPrimer.push_back(oligo);
+                               }
+                               else if(type == "reverse"){
+                                       revPrimer.push_back(oligo);
+                               }
+                               else if(type == "barcode"){
+                                       inOligos >> group;
+                                       barcodes[oligo]=index++;
+                                       groupVector.push_back(group);
                                        
-                               if(allFiles){
-                                       outFASTAVec.push_back(new ofstream((getRootName(fastaFile) + group + ".fasta").c_str(), ios::ate));
+                                       if(allFiles){
+                                               outFASTAVec.push_back(new ofstream((getRootName(fastaFile) + group + ".fasta").c_str(), ios::ate));
+                                       }
                                }
                        }
                }
+               
+               inOligos.close();
+               
+               numFPrimers = forPrimer.size();
+               numRPrimers = revPrimer.size();
+               
        }
-       
-       inOligos.close();
-       
-       numFPrimers = forPrimer.size();
-       numRPrimers = revPrimer.size();
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "getOligos");
+               exit(1);
+       }
+
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::stripBarcode(Sequence& seq, int& group){
-       
-       string rawSequence = seq.getUnaligned();
-       bool success = 0;       //guilty until proven innocent
-       
-       for(map<string,int>::iterator it=barcodes.begin();it!=barcodes.end();it++){
-               string oligo = it->first;
-               if(rawSequence.length() < oligo.length()){      //let's just assume that the barcodes are the same length
-                       success = 0;
-                       break;
-               }
+       try {
+               string rawSequence = seq.getUnaligned();
+               bool success = 0;       //guilty until proven innocent
                
-               if(compareDNASeq(oligo, rawSequence.substr(0,oligo.length()))){
-                       group = it->second;
-                       seq.setUnaligned(rawSequence.substr(oligo.length()));
-                       success = 1;
-                       break;
+               for(map<string,int>::iterator it=barcodes.begin();it!=barcodes.end();it++){
+                       string oligo = it->first;
+                       if(rawSequence.length() < oligo.length()){      //let's just assume that the barcodes are the same length
+                               success = 0;
+                               break;
+                       }
+                       
+                       if(compareDNASeq(oligo, rawSequence.substr(0,oligo.length()))){
+                               group = it->second;
+                               seq.setUnaligned(rawSequence.substr(oligo.length()));
+                               success = 1;
+                               break;
+                       }
                }
+               return success;
+               
        }
-       return success;
-       
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "stripBarcode");
+               exit(1);
+       }
+
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::stripForward(Sequence& seq){
-       
-       string rawSequence = seq.getUnaligned();
-       bool success = 0;       //guilty until proven innocent
-       
-       for(int i=0;i<numFPrimers;i++){
-               string oligo = forPrimer[i];
+       try {
+               string rawSequence = seq.getUnaligned();
+               bool success = 0;       //guilty until proven innocent
                
-               if(rawSequence.length() < oligo.length()){
-                       success = 0;
-                       break;
-               }
-
-               if(compareDNASeq(oligo, rawSequence.substr(0,oligo.length()))){
-                       seq.setUnaligned(rawSequence.substr(oligo.length()));
-                       success = 1;
-                       break;
+               for(int i=0;i<numFPrimers;i++){
+                       string oligo = forPrimer[i];
+                       
+                       if(rawSequence.length() < oligo.length()){
+                               success = 0;
+                               break;
+                       }
+                       
+                       if(compareDNASeq(oligo, rawSequence.substr(0,oligo.length()))){
+                               seq.setUnaligned(rawSequence.substr(oligo.length()));
+                               success = 1;
+                               break;
+                       }
                }
+               
+               return success;
+               
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "stripForward");
+               exit(1);
        }
-       
-       return success;
-       
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::stripReverse(Sequence& seq){
-       
-       string rawSequence = seq.getUnaligned();
-       bool success = 0;       //guilty until proven innocent
-       
-       for(int i=0;i<numRPrimers;i++){
-               string oligo = revPrimer[i];
+       try {
+               string rawSequence = seq.getUnaligned();
+               bool success = 0;       //guilty until proven innocent
                
-               if(rawSequence.length() < oligo.length()){
-                       success = 0;
-                       break;
-               }
+               for(int i=0;i<numRPrimers;i++){
+                       string oligo = revPrimer[i];
+                       
+                       if(rawSequence.length() < oligo.length()){
+                               success = 0;
+                               break;
+                       }
+                       
+                       if(compareDNASeq(oligo, rawSequence.substr(rawSequence.length()-oligo.length(),oligo.length()))){
+                               seq.setUnaligned(rawSequence.substr(rawSequence.length()-oligo.length()));
+                               success = 1;
+                               break;
+                       }
+               }       
+               return success;
                
-               if(compareDNASeq(oligo, rawSequence.substr(rawSequence.length()-oligo.length(),oligo.length()))){
-                       seq.setUnaligned(rawSequence.substr(rawSequence.length()-oligo.length()));
-                       success = 1;
-                       break;
-               }
-       }       
-       return success;
-       
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "stripReverse");
+               exit(1);
+       }
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::cullLength(Sequence& seq){
+       try {
        
-       int length = seq.getNumBases();
-       bool success = 0;       //guilty until proven innocent
-       
-       if(length >= minLength && maxLength == 0)                       {       success = 1;    }
-       else if(length >= minLength && length <= maxLength)     {       success = 1;    }
-       else                                                                                            {       success = 0;    }
+               int length = seq.getNumBases();
+               bool success = 0;       //guilty until proven innocent
+               
+               if(length >= minLength && maxLength == 0)                       {       success = 1;    }
+               else if(length >= minLength && length <= maxLength)     {       success = 1;    }
+               else                                                                                            {       success = 0;    }
+               
+               return success;
        
-       return success;
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "cullLength");
+               exit(1);
+       }
        
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::cullHomoP(Sequence& seq){
-       
-       int longHomoP = seq.getLongHomoPolymer();
-       bool success = 0;       //guilty until proven innocent
-       
-       if(longHomoP <= maxHomoP){      success = 1;    }
-       else                                    {       success = 0;    }
-       
-       return success;
+       try {
+               int longHomoP = seq.getLongHomoPolymer();
+               bool success = 0;       //guilty until proven innocent
+               
+               if(longHomoP <= maxHomoP){      success = 1;    }
+               else                                    {       success = 0;    }
+               
+               return success;
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "cullHomoP");
+               exit(1);
+       }
        
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::cullAmbigs(Sequence& seq){
-       
-       int numNs = seq.getAmbigBases();
-       bool success = 0;       //guilty until proven innocent
-       
-       if(numNs <= maxAmbig)   {       success = 1;    }
-       else                                    {       success = 0;    }
-       
-       return success;
+       try {
+               int numNs = seq.getAmbigBases();
+               bool success = 0;       //guilty until proven innocent
+               
+               if(numNs <= maxAmbig)   {       success = 1;    }
+               else                                    {       success = 0;    }
+               
+               return success;
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "cullAmbigs");
+               exit(1);
+       }
        
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::compareDNASeq(string oligo, string seq){
-       
-       bool success = 1;
-       int length = oligo.length();
-       
-       for(int i=0;i<length;i++){
-               
-               if(oligo[i] != seq[i]){
-                       if(oligo[i] == 'A' || oligo[i] == 'T' || oligo[i] == 'G' || oligo[i] == 'C')    {       success = 0;    }
-                       else if((oligo[i] == 'N' || oligo[i] == 'I') && (seq[i] == 'N'))                                {       success = 0;    }
-                       else if(oligo[i] == 'R' && (seq[i] != 'A' && seq[i] != 'G'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'Y' && (seq[i] != 'C' && seq[i] != 'T'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'M' && (seq[i] != 'C' && seq[i] != 'A'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'K' && (seq[i] != 'T' && seq[i] != 'G'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'W' && (seq[i] != 'T' && seq[i] != 'A'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'S' && (seq[i] != 'C' && seq[i] != 'G'))                                    {       success = 0;    }
-                       else if(oligo[i] == 'B' && (seq[i] != 'C' && seq[i] != 'T' && seq[i] != 'G'))   {       success = 0;    }
-                       else if(oligo[i] == 'D' && (seq[i] != 'A' && seq[i] != 'T' && seq[i] != 'G'))   {       success = 0;    }
-                       else if(oligo[i] == 'H' && (seq[i] != 'A' && seq[i] != 'T' && seq[i] != 'C'))   {       success = 0;    }
-                       else if(oligo[i] == 'V' && (seq[i] != 'A' && seq[i] != 'C' && seq[i] != 'G'))   {       success = 0;    }                       
+       try {
+               bool success = 1;
+               int length = oligo.length();
+               
+               for(int i=0;i<length;i++){
                        
-                       if(success == 0)        {       break;  }
-               }
-               else{
-                       success = 1;
+                       if(oligo[i] != seq[i]){
+                               if(oligo[i] == 'A' || oligo[i] == 'T' || oligo[i] == 'G' || oligo[i] == 'C')    {       success = 0;    }
+                               else if((oligo[i] == 'N' || oligo[i] == 'I') && (seq[i] == 'N'))                                {       success = 0;    }
+                               else if(oligo[i] == 'R' && (seq[i] != 'A' && seq[i] != 'G'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'Y' && (seq[i] != 'C' && seq[i] != 'T'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'M' && (seq[i] != 'C' && seq[i] != 'A'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'K' && (seq[i] != 'T' && seq[i] != 'G'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'W' && (seq[i] != 'T' && seq[i] != 'A'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'S' && (seq[i] != 'C' && seq[i] != 'G'))                                    {       success = 0;    }
+                               else if(oligo[i] == 'B' && (seq[i] != 'C' && seq[i] != 'T' && seq[i] != 'G'))   {       success = 0;    }
+                               else if(oligo[i] == 'D' && (seq[i] != 'A' && seq[i] != 'T' && seq[i] != 'G'))   {       success = 0;    }
+                               else if(oligo[i] == 'H' && (seq[i] != 'A' && seq[i] != 'T' && seq[i] != 'C'))   {       success = 0;    }
+                               else if(oligo[i] == 'V' && (seq[i] != 'A' && seq[i] != 'C' && seq[i] != 'G'))   {       success = 0;    }                       
+                               
+                               if(success == 0)        {       break;  }
+                       }
+                       else{
+                               success = 1;
+                       }
                }
+               
+               return success;
        }
-       
-       return success;
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "compareDNASeq");
+               exit(1);
+       }
+
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::stripQualThreshold(Sequence& seq, ifstream& qFile){
-       
-       string rawSequence = seq.getUnaligned();
-       int seqLength = rawSequence.length();
-       string name;
-       
-       qFile >> name;
-       if(name.substr(1) != seq.getName())     {       mothurOut("sequence name mismatch btwn fasta and qual file"); mothurOutEndLine();       }
-       while (!qFile.eof())    {       char c = qFile.get(); if (c == 10 || c == 13){  break;  }       }
-       
-       int score;
-       int end = seqLength;
-       
-       for(int i=0;i<seqLength;i++){
-               qFile >> score;
-
-               if(score <= qThreshold){
-                       end = i;
-                       break;
+       try {
+               string rawSequence = seq.getUnaligned();
+               int seqLength = rawSequence.length();
+               string name;
+               
+               qFile >> name;
+               if (name.length() != 0) {  if(name.substr(1) != seq.getName())  {       mothurOut("sequence name mismatch btwn fasta and qual file"); mothurOutEndLine();       }  } 
+               while (!qFile.eof())    {       char c = qFile.get(); if (c == 10 || c == 13){  break;  }       }
+               
+               int score;
+               int end = seqLength;
+               
+               for(int i=0;i<seqLength;i++){
+                       qFile >> score;
+                       
+                       if(score <= qThreshold){
+                               end = i;
+                               break;
+                       }
+               }
+               for(int i=end+1;i<seqLength;i++){
+                       qFile >> score;
                }
+               
+               seq.setUnaligned(rawSequence.substr(0,end));
+               
+               return 1;
        }
-       for(int i=end+1;i<seqLength;i++){
-               qFile >> score;
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "stripQualThreshold");
+               exit(1);
        }
-
-       seq.setUnaligned(rawSequence.substr(0,end));
-
-       return 1;
 }
 
 //***************************************************************************************************************
 
 bool TrimSeqsCommand::cullQualAverage(Sequence& seq, ifstream& qFile){
-       
-       string rawSequence = seq.getUnaligned();
-       int seqLength = seq.getNumBases();
-       bool success = 0;       //guilty until proven innocent
-       string name;
-       
-       qFile >> name;
-       if(name.substr(1) != seq.getName())     {       mothurOut("sequence name mismatch btwn fasta and qual file"); mothurOutEndLine();       }
-       while (!qFile.eof())    {       char c = qFile.get(); if (c == 10 || c == 13){  break;  }       }
-       
-       float score;    
-       float average = 0;
-       
-       for(int i=0;i<seqLength;i++){
-               qFile >> score;
-               average += score;
+       try {
+               string rawSequence = seq.getUnaligned();
+               int seqLength = seq.getNumBases();
+               bool success = 0;       //guilty until proven innocent
+               string name;
+               
+               qFile >> name;
+               if (name.length() != 0) {  if(name.substr(1) != seq.getName())  {       mothurOut("sequence name mismatch btwn fasta and qual file"); mothurOutEndLine();       } }
+               while (!qFile.eof())    {       char c = qFile.get(); if (c == 10 || c == 13){  break;  }       }
+               
+               float score;    
+               float average = 0;
+               
+               for(int i=0;i<seqLength;i++){
+                       qFile >> score;
+                       average += score;
+               }
+               average /= seqLength;
+               
+               if(average >= qAverage) {       success = 1;    }
+               else                                    {       success = 0;    }
+               
+               return success;
+       }
+       catch(exception& e) {
+               errorOut(e, "TrimSeqsCommand", "cullQualAverage");
+               exit(1);
        }
-       average /= seqLength;
-       
-       if(average >= qAverage) {       success = 1;    }
-       else                                    {       success = 0;    }
-       
-       return success;
 }
 
 //***************************************************************************************************************