X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=PairedEndModel.h;h=70d14c9de9a97680eb9a683715f887a1d2a1e16f;hb=97554bbac838f2ed578d81f98e421dac0669e74e;hp=c011ceea16d53757384e320ae7196251eea7b956;hpb=86e650e9577999a7ba00ab454d1f6bf674b0ea70;p=rsem.git

diff --git a/PairedEndModel.h b/PairedEndModel.h
index c011cee..70d14c9 100644
--- a/PairedEndModel.h
+++ b/PairedEndModel.h
@@ -230,25 +230,25 @@ void PairedEndModel::estimateFromReads(const char* readFN) {
     for (int i = 0; i < 3; i++)
     	if (N[i] > 0) {
     		genReadFileNames(readFN, i, read_type, s, readFs);
-    		ReadReader<PairedEndRead> reader(s, readFs);
+    		ReadReader<PairedEndRead> reader(s, readFs, refs->hasPolyA(), seedLen); // allow calculation of calc_lq() function
 
     		int cnt = 0;
     		while (reader.next(read)) {
     			SingleRead mate1 = read.getMate1();
     			SingleRead mate2 = read.getMate2();
 			
-			if (!read.isLowQuality()) {
-			  mld->update(mate1.getReadLength(), 1.0);
-			  mld->update(mate2.getReadLength(), 1.0);
+    			if (!read.isLowQuality()) {
+    				mld->update(mate1.getReadLength(), 1.0);
+    				mld->update(mate2.getReadLength(), 1.0);
 			  
-			  if (i == 0) {
-			    npro->updateC(mate1.getReadSeq());
-			    npro->updateC(mate2.getReadSeq());
-			  }
-			}
-			else if (verbose && (mate1.getReadLength() < OLEN || mate2.getReadLength() < OLEN)) { 
-			  printf("Warning: Read %s is ignored due to at least one of the mates' length < %d!\n", read.getName().c_str(), OLEN);
-			}
+    				if (i == 0) {
+    					npro->updateC(mate1.getReadSeq());
+    					npro->updateC(mate2.getReadSeq());
+    				}
+    			}
+    			else if (verbose && (mate1.getReadLength() < seedLen || mate2.getReadLength() < seedLen)) {
+    				printf("Warning: Read %s is ignored due to at least one of the mates' length < seed length %d!\n", read.getName().c_str(), seedLen);
+    			}
 
     			++cnt;
     			if (verbose && cnt % 1000000 == 0) { printf("%d READS PROCESSED\n", cnt); }
@@ -407,39 +407,39 @@ void PairedEndModel::finishSimulation() {
 }
 
 void PairedEndModel::calcMW() {
-  assert(seedLen >= OLEN && mld->getMinL() >= seedLen);
-
-  memset(mw, 0, sizeof(double) * (M + 1));
-  mw[0] = 1.0;
-
-  for (int i = 1; i <= M; i++) { 
-    RefSeq& ref = refs->getRef(i);
-    int totLen = ref.getTotLen();
-    int fullLen = ref.getFullLen();
-    int end = std::min(fullLen, totLen - gld->getMinL() + 1);
-    double value = 0.0;
-    int minL, maxL;
-    int effL, pfpos;
-
-    //seedPos is fpos here
-    for (int seedPos = 0; seedPos < end; seedPos++) 
-      if (ref.getMask(seedPos)) {
-	minL = gld->getMinL();
-	maxL = std::min(gld->getMaxL(), totLen - seedPos);
-	pfpos = seedPos;
-	for (int fragLen = minL; fragLen <= maxL; fragLen++) {
-	  effL = std::min(fullLen, totLen - fragLen + 1); 
-	  value += gld->getAdjustedProb(fragLen, totLen) * rspd->getAdjustedProb(pfpos, effL, fullLen); 
+	assert(mld->getMinL() >= seedLen);
+
+	memset(mw, 0, sizeof(double) * (M + 1));
+	mw[0] = 1.0;
+
+	for (int i = 1; i <= M; i++) {
+		RefSeq& ref = refs->getRef(i);
+		int totLen = ref.getTotLen();
+		int fullLen = ref.getFullLen();
+		int end = std::min(fullLen, totLen - gld->getMinL() + 1);
+		double value = 0.0;
+		int minL, maxL;
+		int effL, pfpos;
+
+		//seedPos is fpos here
+		for (int seedPos = 0; seedPos < end; seedPos++)
+			if (ref.getMask(seedPos)) {
+				minL = gld->getMinL();
+				maxL = std::min(gld->getMaxL(), totLen - seedPos);
+				pfpos = seedPos;
+				for (int fragLen = minL; fragLen <= maxL; fragLen++) {
+					effL = std::min(fullLen, totLen - fragLen + 1);
+					value += gld->getAdjustedProb(fragLen, totLen) * rspd->getAdjustedProb(pfpos, effL, fullLen);
+				}
+			}
+
+		mw[i] = 1.0 - value;
+
+		if (mw[i] < 1e-8) {
+			//fprintf(stderr, "Warning: %dth reference sequence is masked for almost all positions!\n", i);
+			mw[i] = 0.0;
+		}
 	}
-      }
-    
-    mw[i] = 1.0 - value;
-
-    if (mw[i] < 1e-8) { 
-      //fprintf(stderr, "Warning: %dth reference sequence is masked for almost all positions!\n", i);
-      mw[i] = 0.0;
-    }
-  }
 }
 
 #endif /* PAIREDENDMODEL_H_ */