Permalink
Browse files

remove hhm for all reads in VNTRTyper

  • Loading branch information...
1 parent e25873c commit 7ddff503ed36d45490cd99258221dc5b03b0c0a5 @mdcao committed Jun 19, 2017
View
@@ -144,6 +144,8 @@ else
O_SERVER=
endif
+docs: jar
+ java -cp $(JAR_FILE):$(LIB_DIR)/guava-18.0.jar:$(LIB_DIR)/slf4j-api-1.7.25.jar:$(LIB_DIR)/slf4j-simple-1.7.25.jar japsa.util.deploy.GenDocs && cd docs && make html
RELEASE=JapsaRelease
@@ -299,8 +299,7 @@ public static void main(String[] args) throws Exception,
//
HashMap<String, String> tempReadSequences = new HashMap<String, String>();
-
-
+
for(int x = 0;x<readSequences.size();x++){
Sequence temp = readSequences.get(x);
@@ -314,8 +313,7 @@ public static void main(String[] args) throws Exception,
KmeanClusteringWithReads clusterObj1 = new KmeanClusteringWithReads();
-
-
+
clusterResult = clusterObj1.Clustering(tempReads);
ArrayList<String> cluster1String = clusterResult.get(1);
@@ -372,20 +370,22 @@ public static void main(String[] args) throws Exception,
processRead(cluster1Consensus, dpBatch, fraction, hmmFlank, hmmPad, period, outOS );
else
outOS.print("##No consensus found for 1");
- if (cluster1Sequence.size() >= 1) {
- processBatch(cluster1Sequence, dpBatch, fraction, hmmFlank, hmmPad, period, outOS);
- }else
- outOS.print("##No cluster found for 1");
+
+ //speed//MDC comment this out to improve speed now that we only use consensus
+ //speed//if (cluster1Sequence.size() >= 1) {
+ //speed// processBatch(cluster1Sequence, dpBatch, fraction, hmmFlank, hmmPad, period, outOS);
+ //speed//}else
+ //speed// outOS.print("##No cluster found for 1");
outOS.print("####Allele 2\n");
if (cluster2Consensus != null)
processRead(cluster2Consensus, dpBatch, fraction, hmmFlank, hmmPad, period, outOS );
else
outOS.print("##No consensus found for 2");
- if (cluster2Sequence.size() >= 1) {
- processBatch(cluster2Sequence, dpBatch, fraction, hmmFlank, hmmPad, period, outOS);
- }else
- outOS.print("##No cluster found for 2");
+ //speed//if (cluster2Sequence.size() >= 1) {
+ //speed// processBatch(cluster2Sequence, dpBatch, fraction, hmmFlank, hmmPad, period, outOS);
+ //speed//}else
+ //speed// outOS.print("##No cluster found for 2");
//outOS.print(trVar.toString(headers));
//outOS.print('\n');
@@ -133,10 +133,6 @@ public static void main(String[] args) throws Exception {
/**
* Assume both inserts and annotations are sorted by the start position
- *
- * @param iFile
- * @param aFile
- * @throws IOException
*/
static int bsearch(JapsaAnnotation anno, int start, int end, int gap){

0 comments on commit 7ddff50

Please sign in to comment.