From 58646842e2152ca316e68bdefb4dd3be09d2bd0a Mon Sep 17 00:00:00 2001 From: westcott Date: Mon, 2 May 2011 16:38:34 +0000 Subject: [PATCH] modified chimera.slayer bootstrap to bump up to 1000 on borderline bootstrap values --- slayer.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/slayer.cpp b/slayer.cpp index 88f9c1c..0ef7953 100644 --- a/slayer.cpp +++ b/slayer.cpp @@ -67,26 +67,14 @@ string Slayer::getResults(Sequence* query, vector refSeqs) { //are we within 10 points of the bootstrap cutoff? if ((divs[k].bsMax >= (minBS-10)) && (iters < 1000)) { - snpsLeft = getSNPS(divs[k].parentA.getAligned(), divs[k].querySeq.getAligned(), divs[k].parentB.getAligned(), divs[k].winLStart, divs[k].winLEnd); - snpsRight = getSNPS(divs[k].parentA.getAligned(), divs[k].querySeq.getAligned(), divs[k].parentB.getAligned(), divs[k].winRStart, divs[k].winREnd); - - if (m->control_pressed) { delete q; delete leftParent; delete rightParent; return "no"; } - - numSNPSLeft = snpsLeft.size(); - numSNPSRight = snpsRight.size(); - - //require at least 4 SNPs on each side of the break - if ((numSNPSLeft >= 4) && (numSNPSRight >= 4)) { - float BS_A, BS_B; - bootstrapSNPS(snpsLeft, snpsRight, BS_A, BS_B, 1000); + bootstrapSNPS(snpsLeft, snpsRight, BS_A, BS_B, 1000); - if (m->control_pressed) { return "no"; } + if (m->control_pressed) { delete q; delete leftParent; delete rightParent; return "no"; } - divs[k].bsa = BS_A; - divs[k].bsb = BS_B; - divs[k].bsMax = max(BS_A, BS_B); - divs[k].chimeraMax = max(divs[k].qla_qrb, divs[k].qlb_qra); - } + divs[k].bsa = BS_A; + divs[k].bsb = BS_B; + divs[k].bsMax = max(BS_A, BS_B); + divs[k].chimeraMax = max(divs[k].qla_qrb, divs[k].qlb_qra); } //so results reflect orignal alignment -- 2.39.2