X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=alg%2Fsequence.cpp;h=1f21bd5edc83e8e66894ffc7ee473c31bfbd170c;hp=2e845c67bdfaa84d5843e0b05a5e3a766e363eaf;hb=6d25d4d945af696134bdf788b111f38b197b1a15;hpb=02adcab9918657891638e68580b8b88e6d935875 diff --git a/alg/sequence.cpp b/alg/sequence.cpp index 2e845c6..1f21bd5 100644 --- a/alg/sequence.cpp +++ b/alg/sequence.cpp @@ -32,6 +32,7 @@ namespace fs = boost::filesystem; namespace spirit = boost::spirit; #include "alg/sequence.hpp" +#include "io.hpp" #include "mussa_exceptions.hpp" #include @@ -162,22 +163,6 @@ Sequence &Sequence::operator=(const Sequence& s) return *this; } -static void multiplatform_getline(std::istream& in, std::string& line) -{ - line.clear(); - char c; - in.get(c); - while(in.good() and !(c == '\012' or c == '\015') ) { - line.push_back(c); - in.get(c); - } - // if we have cr-lf eat it - c = in.peek(); - if (c=='\012' or c == '\015') { - in.get(); - } -} - void Sequence::load_fasta(fs::path file_path, int seq_num, int start_index, int end_index) { load_fasta(file_path, reduced_nucleic_alphabet, seq_num, start_index, end_index);