X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SingleModel.h;h=bdf920ff271c133c749214244604fa319eac80c4;hb=90df7a1408511063de96e29658ffa289d43cc0bb;hp=f1d543fc1d5f0f5e4e992339f8575caa79924888;hpb=a97cc1d4f0111f7fe523227412a2147f7a763d56;p=rsem.git

diff --git a/SingleModel.h b/SingleModel.h
index f1d543f..bdf920f 100644
--- a/SingleModel.h
+++ b/SingleModel.h
@@ -315,17 +315,18 @@ 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");
 	if (fi == NULL) { fprintf(stderr, "Cannot open %s! It may not exist.\n", inpF); exit(-1); }
 
-	fscanf(fi, "%d", &val);
+	assert(fscanf(fi, "%d", &val) == 1);
 	assert(val == model_type);
 
 	ori->read(fi);
 	gld->read(fi);
-	fscanf(fi, "%d", &val);
+	assert(fscanf(fi, "%d", &val) == 1);
 	if (val > 0) {
 		if (mld == NULL) mld = new LenDist();
 		mld->read(fi);
@@ -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++) assert(fscanf(fi, "%lf", &mw[i]) == 1);
+		}
 	}
 
 	fclose(fi);
 }
 
+//Only master node can call. Only be called at EM.cpp
 void SingleModel::write(const char* outF) {
 	FILE *fo = fopen(outF, "w");
 
@@ -418,9 +423,8 @@ bool SingleModel::simulate(int rid, SingleRead& read, int& sid) {
 		}
 	}
 
-	std::ostringstream stdout;
-	stdout<<rid<<"_"<<dir<<"_"<<sid<<"_"<<pos;
-	name = stdout.str();
+	strout<<rid<<"_"<<dir<<"_"<<sid<<"_"<<pos;
+	name = strout.str();
 
 	read = SingleRead(name, readseq);