added parameter to chimera.uchime

[mothur.git] / uchime_main.cpp

diff --git a/uchime_main.cpp b/uchime_main.cpp
index 40e7f44546668bb7d22d1a0b4e8800f29fc89e56..0465c720a6645c1ecd5a1d29155cbb0855748436 100644 (file)
--- a/uchime_main.cpp
+++ b/uchime_main.cpp
@@ -1,3 +1,5 @@
+//uchime by Robert C. Edgar http://drive5.com/uchime This code is donated to the public domain.\r
+\r
 #include "myutils.h"\r
 #include "chime.h"\r
 #include "seqdb.h"\r
@@ -107,11 +109,7 @@ int uchime_main(int argc, char *argv[])
                return 0;\r
                }\r
 \r
-       //printf("uchime v" MY_VERSION ".%s\n", SVN_VERSION);\r
-       //printf("by Robert C. Edgar\n");\r
-       //printf("http://drive5.com/uchime\n");\r
-       //printf("This code is donated to the public domain.\n");\r
-       //printf("\n");\r
+               \r
        if (!optset_w)\r
                opt_w = 8;\r
        \r
@@ -203,10 +201,16 @@ int uchime_main(int argc, char *argv[])
 \r
                WriteChimeHit(g_fUChime, Hit);\r
 \r
-               ProgressStep(i, QuerySeqCount, "%u/%u chimeras found (%.1f%%)", HitCount, i, Pct(HitCount, i+1));\r
-               \r
+               //ProgressStep(i, QuerySeqCount, "%u/%u chimeras found (%.1f%%)", HitCount, i, Pct(HitCount, i+1));\r
+                       //report progress\r
+                       if((i+1) % 100 == 0){   m->mothurOut("Processing sequence: " + toString(i+1) + ", " + toString(HitCount) + " chimeras found."); m->mothurOutEndLine();          }\r
+               }\r
+               if (!m->control_pressed) { \r
+                       //report progress\r
+                       if((QuerySeqCount) % 100 != 0){ m->mothurOut("Processing sequence: " + toString(QuerySeqCount) + ", " + toString(HitCount) + " chimeras found."); m->mothurOutEndLine();                }\r
                }\r
 \r
+\r
        Log("\n");\r
        Log("%s: %u/%u chimeras found (%.1f%%)\n",\r
          opt_input.c_str(), HitCount, QuerySeqCount, Pct(HitCount, QuerySeqCount));\r