X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=dlibshuff.cpp;h=4947e0500611bdf1f43bfad25374ef21369f30c8;hp=9db8872abfdab387ed6a71398e570442fee6022d;hb=615301e57c25e241356a9c2380648d117709458d;hpb=197c6d3303439582502840980d6a85cf3aab2314 diff --git a/dlibshuff.cpp b/dlibshuff.cpp index 9db8872..4947e05 100644 --- a/dlibshuff.cpp +++ b/dlibshuff.cpp @@ -46,13 +46,23 @@ vector > DLibshuff::evaluateAll(){ double DLibshuff::dCalculate(int x, int y){ + double sum = 0; + minX = getMinX(x); + + if (m->control_pressed) { return sum; } + minXY = getMinXY(x, y); + if (m->control_pressed) { return sum; } + vector nx = calcN(minX); + + if (m->control_pressed) { return sum; } + vector nxy = calcN(minXY); - - double sum = 0; + + if (m->control_pressed) { return sum; } for(int i=0;i