From: Dariusz Murakowski <murakdar@mit.edu>
Date: Thu, 17 Apr 2014 02:03:15 +0000 (-0400)
Subject: Print supplementary output file (*.sum) with CSV sequence.
X-Git-Url: http://src.murakowski.org/?a=commitdiff_plain;h=33c0bd84e3d0c5b959d4c249220f28d75610cd87;p=VirEvoDyn.git

Print supplementary output file (*.sum) with CSV sequence.
---

diff --git a/test/importState.test.expected-sum b/test/importState.test.expected-sum
index 1fc5d79..b0ff54a 100644
--- a/test/importState.test.expected-sum
+++ b/test/importState.test.expected-sum
@@ -1,2 +1,2 @@
-3	103	29	30	57	60	74	78	90
-3	129	24	30	57	60	74	78	90
+3	103	29,30,57,60,74,78,90
+3	129	24,30,57,60,74,78,90
diff --git a/test/newFormat.test.expected-sum b/test/newFormat.test.expected-sum
index 57cfd74..1f5c4c9 100644
--- a/test/newFormat.test.expected-sum
+++ b/test/newFormat.test.expected-sum
@@ -1,2 +1,2 @@
-3	99314	30	57	60	74	78	90
-3	99142	30	57	60	74	78	90
+3	99314	30,57,60,74,78,90
+3	99142	30,57,60,74,78,90
diff --git a/test/test1_01-00.test.expected-sum b/test/test1_01-00.test.expected-sum
index 0d63595..9339522 100644
--- a/test/test1_01-00.test.expected-sum
+++ b/test/test1_01-00.test.expected-sum
@@ -1,2 +1,2 @@
-3	84	57	60	74	78	90
-3	108	57	60	74	78	90
+3	84	57,60,74,78,90
+3	108	57,60,74,78,90
diff --git a/test/test1_01-01.test.expected-sum b/test/test1_01-01.test.expected-sum
index 36e89ab..727036c 100644
--- a/test/test1_01-01.test.expected-sum
+++ b/test/test1_01-01.test.expected-sum
@@ -1,2 +1,2 @@
-3	99409	30	57	60	74	78	90
-3	99291	30	57	60	74	78	90
+3	99409	30,57,60,74,78,90
+3	99291	30,57,60,74,78,90
diff --git a/test/test1_01-10.test.expected-sum b/test/test1_01-10.test.expected-sum
index dfc53b0..6198c8f 100644
--- a/test/test1_01-10.test.expected-sum
+++ b/test/test1_01-10.test.expected-sum
@@ -1,2 +1,2 @@
-3	83	57	60	74	78	90
-3	63	57	60	74	78	90
+3	83	57,60,74,78,90
+3	63	57,60,74,78,90
diff --git a/test/test1_01-11.test.expected-sum b/test/test1_01-11.test.expected-sum
index 36e89ab..727036c 100644
--- a/test/test1_01-11.test.expected-sum
+++ b/test/test1_01-11.test.expected-sum
@@ -1,2 +1,2 @@
-3	99409	30	57	60	74	78	90
-3	99291	30	57	60	74	78	90
+3	99409	30,57,60,74,78,90
+3	99291	30,57,60,74,78,90
diff --git a/test/test1_10-00.test.expected-sum b/test/test1_10-00.test.expected-sum
index 62e70ed..0852def 100644
--- a/test/test1_10-00.test.expected-sum
+++ b/test/test1_10-00.test.expected-sum
@@ -1,2 +1,2 @@
-3	102	29	30	57	60	74	78	90
-3	135	24	30	57	60	74	78	90
+3	102	29,30,57,60,74,78,90
+3	135	24,30,57,60,74,78,90
diff --git a/test/test1_10-01.test.expected-sum b/test/test1_10-01.test.expected-sum
index 5d81d40..7768982 100644
--- a/test/test1_10-01.test.expected-sum
+++ b/test/test1_10-01.test.expected-sum
@@ -1,2 +1,2 @@
-3	99294	30	57	60	74	78	90
-3	99113	30	57	60	74	78	90
+3	99294	30,57,60,74,78,90
+3	99113	30,57,60,74,78,90
diff --git a/test/test1_10-10.test.expected-sum b/test/test1_10-10.test.expected-sum
index 3eeab5c..969f5fa 100644
--- a/test/test1_10-10.test.expected-sum
+++ b/test/test1_10-10.test.expected-sum
@@ -1,2 +1,2 @@
-3	46	29	30	57	60	74	78	90
-3	77	30	32	57	60	74	78	90
+3	46	29,30,57,60,74,78,90
+3	77	30,32,57,60,74,78,90
diff --git a/test/test1_10-11.test.expected-sum b/test/test1_10-11.test.expected-sum
index 5d81d40..7768982 100644
--- a/test/test1_10-11.test.expected-sum
+++ b/test/test1_10-11.test.expected-sum
@@ -1,2 +1,2 @@
-3	99294	30	57	60	74	78	90
-3	99113	30	57	60	74	78	90
+3	99294	30,57,60,74,78,90
+3	99113	30,57,60,74,78,90
diff --git a/test/test1_11-00.test.expected-sum b/test/test1_11-00.test.expected-sum
index 1fc5d79..b0ff54a 100644
--- a/test/test1_11-00.test.expected-sum
+++ b/test/test1_11-00.test.expected-sum
@@ -1,2 +1,2 @@
-3	103	29	30	57	60	74	78	90
-3	129	24	30	57	60	74	78	90
+3	103	29,30,57,60,74,78,90
+3	129	24,30,57,60,74,78,90
diff --git a/test/test1_11-01.test.expected-sum b/test/test1_11-01.test.expected-sum
index 57cfd74..1f5c4c9 100644
--- a/test/test1_11-01.test.expected-sum
+++ b/test/test1_11-01.test.expected-sum
@@ -1,2 +1,2 @@
-3	99314	30	57	60	74	78	90
-3	99142	30	57	60	74	78	90
+3	99314	30,57,60,74,78,90
+3	99142	30,57,60,74,78,90
diff --git a/test/test1_11-10.test.expected-sum b/test/test1_11-10.test.expected-sum
index 5cdd6fd..e6c52c4 100644
--- a/test/test1_11-10.test.expected-sum
+++ b/test/test1_11-10.test.expected-sum
@@ -1,2 +1,2 @@
-3	82	57	60	74	78	90
-3	118	57	60	74	78	90
+3	82	57,60,74,78,90
+3	118	57,60,74,78,90
diff --git a/test/test1_11-11.test.expected-sum b/test/test1_11-11.test.expected-sum
index 57cfd74..1f5c4c9 100644
--- a/test/test1_11-11.test.expected-sum
+++ b/test/test1_11-11.test.expected-sum
@@ -1,2 +1,2 @@
-3	99314	30	57	60	74	78	90
-3	99142	30	57	60	74	78	90
+3	99314	30,57,60,74,78,90
+3	99142	30,57,60,74,78,90
diff --git a/test/verbose.test.expected-sum b/test/verbose.test.expected-sum
index 1fc5d79..b0ff54a 100644
--- a/test/verbose.test.expected-sum
+++ b/test/verbose.test.expected-sum
@@ -1,2 +1,2 @@
-3	103	29	30	57	60	74	78	90
-3	129	24	30	57	60	74	78	90
+3	103	29,30,57,60,74,78,90
+3	129	24,30,57,60,74,78,90
diff --git a/wf.cpp b/wf.cpp
index 6d2a594..929cd18 100644
--- a/wf.cpp
+++ b/wf.cpp
@@ -144,7 +144,19 @@ void run(RunParameters &r, unsigned seed) {
                 // but more likely to escape one than all, so that one is output
                 
                 fprintf(supout,"%d\t%d",i,esc_num);
-                for (std::set<unsigned int>::iterator iter=esc_var.begin(); iter!=esc_var.end(); ++iter) fprintf(supout,"\t%d",*iter);
+
+                //for (std::set<unsigned int>::iterator iter=esc_var.begin(); iter!=esc_var.end(); ++iter) fprintf(supout,"\t%d",*iter);
+
+                // print sequence as CSV (comma-separated)
+                fprintf(supout,"\t");
+                std::set<unsigned int>::iterator ms_iter=esc_var.begin();
+                if (ms_iter != esc_var.end()) {
+                    fprintf(supout,"%d",*ms_iter);
+                    ++ms_iter;
+                }
+                for (; ms_iter!=esc_var.end(); ++ms_iter)
+                    fprintf(supout,",%d",*ms_iter);
+
                 fprintf(supout,"\n");
                 
                 fflush(supout);