a bug in *?Model.h was fixed.

diff --git a/PairedEndModel.h b/PairedEndModel.h
index bd046becb3fcd9cacbbc271863491800a6e67ee1..6e0f1a4fb385f7dbc53f904c85c95508f7f933a8 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");
 

diff --git a/PairedEndQModel.h b/PairedEndQModel.h
index 5437eb4c0051974b501829aa6ad68c6f69072ac3..2b899c57fa6061e0974e56083da03f580766351d 100644 (file)
--- a/PairedEndQModel.h
+++ b/PairedEndQModel.h
@@ -311,15 +311,19 @@ void PairedEndQModel::read(const char* inpF) {
        qpro->read(fi);
        nqpro->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 PairedEndQModel::write(const char* outF) {
        FILE *fo = fopen(outF, "w");
 

diff --git a/SingleModel.h b/SingleModel.h
index f1d543fc1d5f0f5e4e992339f8575caa79924888..49c103b956b9fa389edac2ad4a4cefcce000a2cc 100644 (file)
--- a/SingleModel.h
+++ b/SingleModel.h
@@ -315,6 +315,7 @@ void SingleModel::collect(const SingleModel& o) {
        npro->collect(*(o.npro));
 }
 
+//Only master node can call
 void SingleModel::read(const char* inpF) {
        int val;
        FILE *fi = fopen(inpF, "r");
@@ -334,14 +335,18 @@ void SingleModel::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 be called at EM.cpp
 void SingleModel::write(const char* outF) {
        FILE *fo = fopen(outF, "w");
 

diff --git a/SingleQModel.h b/SingleQModel.h
index dff9c4691153911a3d060b9d063a4856f4628b77..d2c8ca1fdb67f8075e699db44f097c5502c12419 100644 (file)
--- a/SingleQModel.h
+++ b/SingleQModel.h
@@ -349,15 +349,18 @@ void SingleQModel::read(const char* inpF) {
        qpro->read(fi);
        nqpro->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 SingleQModel::write(const char* outF) {
        FILE *fo = fopen(outF, "w");
 

diff --git a/simulation.cpp b/simulation.cpp
index 2511f33693ce42a3751d07542dca2ce8139a0f54..5b1e7320dec60e69c2cae1cbb64ffa6cc55ccc44 100644 (file)
--- a/simulation.cpp
+++ b/simulation.cpp
@@ -127,7 +127,7 @@ void simulate(char* modelF, char* resultsF) {
        for (int i = 1; i <= M; i++) {
          getline(fin, line);
          size_t pos = 0;
-         for (int j = 0; j < 3; j++) pos = line.find_first_of('\t', pos) + 1;
+         for (int j = 0; j < 2; j++) pos = line.find_first_of('\t', pos) + 1;
          size_t pos2 = line.find_first_of('\t', pos);
          if (pos2 == string::npos) pos2 = line.length();
          tau = atof(line.substr(pos, pos2 - pos).c_str());