Modified build rules for sam/libbam.a to enable parallel build

[rsem.git] / simulation.cpp

diff --git a/simulation.cpp b/simulation.cpp
index 19f2b928b247f4557b24414f80d9eeda029743da..e0c9cec83c1891ee9e5ec099602c94fe024ef9d3 100644 (file)
--- a/simulation.cpp
+++ b/simulation.cpp
@@ -138,19 +138,19 @@ void simulate(char* modelF, char* resultsF) {
        fin.close();
        for (int i = 1; i <= M; i++) theta[i] = theta[i] / denom * (1.0 - theta[0]);
        
-       int tmp2140 = 0;
+       int resimulation_count = 0;
 
        //simulating...
        model.startSimulation(&sampler, theta);
        for (int i = 0; i < N; i++) {
-         while (!model.simulate(i, read, sid)) { ++tmp2140; }//;
+               while (!model.simulate(i, read, sid)) { ++resimulation_count; }
                read.write(n_os, os);
                ++counts[sid];
                if ((i + 1) % 1000000 == 0 && verbose) printf("GEN %d\n", i + 1);
        }
        model.finishSimulation();
 
-       printf("Total number of resimulation is %d\n", tmp2140);
+       printf("Total number of resimulation is %d\n", resimulation_count);
 }
 
 void writeResFiles(char* outFN) {
@@ -237,7 +237,7 @@ int main(int argc, char* argv[]) {
        //read model type from modelF
        fi = fopen(argv[2], "r");
        if (fi == NULL) { fprintf(stderr, "Cannot open %s! It may not exist.\n", argv[2]); exit(-1); }
-       fscanf(fi, "%d", &model_type);
+       assert(fscanf(fi, "%d", &model_type) == 1);
        fclose(fi);
 
        theta = new double[M + 1];