Changeset 579

Timestamp:

05/17/10 14:24:29 (4 months ago)

Author:

reed

Message:

added support for output blocks

Location:

current/src

Files:

• dawg.cpp (modified) (1 diff)
• include/dawg/output.h (modified) (4 diffs)
• lib/output.cpp (modified) (2 diffs)

current/src/dawg.cpp

@@ -131 +131 @@
     const char *file_name = arg.output.empty() ? glopts.output_file.c_str()
                                                : arg.output.c_str();
-    unsigned int max_rep = (!arg.unsplit && (arg.split || glopts.output_split))
-                         ? num_reps-1 : 0;
+    bool split  = (!arg.unsplit && (arg.split || glopts.output_split));
     bool append = (!arg.unappend && (arg.append || glopts.output_append));
-    if(!write_aln.open(file_name, max_rep, append)) {
+    if(!write_aln.open(file_name, num_reps-1, split, append)) {
         DAWG_ERROR("bad configuration");
         return EXIT_FAILURE;
     }
+    write_aln.set_blocks(glopts.output_block_head.c_str(),
+        glopts.output_block_between.c_str(),
+        glopts.output_block_tail.c_str(),
+        glopts.output_block_before.c_str(),
+        glopts.output_block_after.c_str()
+    );      
 
     vector<dawg::ma> configs;

current/src/include/dawg/output.h

@@ -22 +22 @@
         split_width(0), app(false), rep(0), split_id_offset(0) { }
 
-    bool open(const char *file_name, unsigned int max_rep=0, bool append=false);
+    bool open(const char *file_name, unsigned int max_rep=0, bool split = false, bool append=false);
 
     inline bool operator()(const alignment& aln) {
@@ -28 +28 @@
         if(p_out == NULL)
             return false;
+        std::ostream &out = *p_out;
+        if(split_width == 0)
+            out << ((rep == 0) ? block_head : block_between);
+        out << block_before;
         (this->*do_op)(aln);
+        out << block_after;
+        if(split_width == 0 && rep == last_rep)
+            out << block_tail;
         ++rep;
+        out.flush();
         return true;
     }
@@ -41 +49 @@
     inline void set_ostream(std::ostream *os) {
         p_out = os;
+    }
+    
+    inline void set_blocks(const char *h, const char *w,
+        const char *t, const char *b, const char *a) {
+        block_head.assign(h);
+        block_between.assign(w);
+        block_tail.assign(t);       
+        block_before.assign(b);
+        block_after.assign(a);
     }
 
@@ -59 +76 @@
     std::ofstream fout;
     std::size_t format_id;
-    unsigned int rep, split_width;
+    unsigned int rep, split_width, last_rep;
     bool app;
     std::string split_file_name;
     std::string::size_type split_id_offset;
+    
+    std::string block_head;
+    std::string block_between;
+    std::string block_tail;
+    std::string block_before;
+    std::string block_after;
 };
 

current/src/lib/output.cpp

@@ -21 +21 @@
 using namespace std;
 
-bool dawg::output::open(const char *file_name, unsigned int max_rep, bool append) {
+bool dawg::output::open(const char *file_name, unsigned int max_rep, bool split, bool append) {
     typedef boost::iterator_range<const char*> cs_range;
     set_format("aln");
+    last_rep = max_rep;
     rep = 0;
     cs_range format(file_name, file_name);
@@ -52 +53 @@
         app = append;
         // find how wide the id number must be
-        unsigned int m = max_rep;
+        unsigned int m = split ? max_rep : 0;
         split_width = (m == 0) ? 0 : (m < 10) ? 1 : (m < 100) ? 2 : (m < 1000) ? 3 :
             (m < 10000) ? 4 : (m < 100000) ? 5 : (m < 1000000) ? 6 :