From 3b9adf8b8f6287a38d0aac8487cefb1b2cba6aa0 Mon Sep 17 00:00:00 2001 From: Bo Li Date: Thu, 21 Apr 2011 14:15:57 -0500 Subject: [PATCH] a bug in *?Model.h was fixed. --- PairedEndModel.h | 11 +++++++---- PairedEndQModel.h | 12 ++++++++---- SingleModel.h | 11 ++++++++--- SingleQModel.h | 11 +++++++---- simulation.cpp | 2 +- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/PairedEndModel.h b/PairedEndModel.h index bd046be..6e0f1a4 100644 --- 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 5437eb4..2b899c5 100644 --- 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 f1d543f..49c103b 100644 --- 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 dff9c46..d2c8ca1 100644 --- 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 2511f33..5b1e732 100644 --- 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()); -- 2.39.2