rsem v1.1.9

[rsem.git] / PairedEndModel.h

diff --git a/PairedEndModel.h b/PairedEndModel.h
index bd046becb3fcd9cacbbc271863491800a6e67ee1..7c8737465c959da2e3089e39d0fcb091ab3e52ff 100644 (file)
--- a/PairedEndModel.h
+++ b/PairedEndModel.h
@@ -298,15 +298,18 @@ void PairedEndModel::read(const char* inpF) {
        pro->read(fi);
        npro->read(fi);
 
-       if (fscanf(fi, "%d", &M) == 1) {
-         mw = new double[M + 1];
-         for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+       if (fscanf(fi, "%d", &val) == 1) {
+               if (M == 0) M = val;
+               if (M == val) {
+                       mw = new double[M + 1];
+                       for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+               }
        }
 
        fclose(fi);
 }
 
-//Only master node can call
+//Only master node can call. Only be called at EM.cpp
 void PairedEndModel::write(const char* outF) {
        FILE *fo = fopen(outF, "w");
 
@@ -382,9 +385,8 @@ bool PairedEndModel::simulate(int rid, PairedEndRead& read, int& sid) {
                readseq2 = pro->simulate(sampler, mateL2, m2pos, m2dir, ref);
        }
 
-       std::ostringstream stdout;
-       stdout<<rid<<"_"<<dir<<"_"<<sid<<"_"<<pos<<"_"<<insertL;
-       name = stdout.str();
+       strout<<rid<<"_"<<dir<<"_"<<sid<<"_"<<pos<<"_"<<insertL;
+       name = strout.str();
 
        read = PairedEndRead(SingleRead(name + "/1", readseq1), SingleRead(name + "/2", readseq2));