X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=slibshuff.cpp;h=92998e66ac1eadb442b5b0afc0cfee33835f902a;hp=e1ffb0ec0de20ea11345db0b5040ed492e829a0f;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0 diff --git a/slibshuff.cpp b/slibshuff.cpp index e1ffb0e..92998e6 100644 --- a/slibshuff.cpp +++ b/slibshuff.cpp @@ -53,13 +53,24 @@ vector > SLibshuff::evaluateAll(){ double SLibshuff::sCalculate(int x, int y){ try{ + double sum = 0.0,t=0.0; + minX = getMinX(x); + + if (m->control_pressed) { return sum; } + minXY = getMinXY(x,y); + + if (m->control_pressed) { return sum; } sort(minX.begin(), minX.end()); + + if (m->control_pressed) { return sum; } + sort(minXY.begin(), minXY.end()); + + if (m->control_pressed) { return sum; } - double sum = 0.0,t=0.0; int ix=0,iy=0; while( (ix < groupSizes[x]) && (iy < groupSizes[x]) ) { double h = (ix-iy)/double(groupSizes[x]);