X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedkulczynski.cpp;h=6aad5df26f2a6912b950df9e8d8211e730ef0fe1;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=cd09063fdf6143d683217dbdfc3ea67e3c409438;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;p=mothur.git diff --git a/sharedkulczynski.cpp b/sharedkulczynski.cpp index cd09063..6aad5df 100644 --- a/sharedkulczynski.cpp +++ b/sharedkulczynski.cpp @@ -2,7 +2,7 @@ * sharedkulczynski.cpp * Mothur * - * Created by John Westcott on 3/24/09. + * Created by Sarah Westcott on 3/24/09. * Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved. * */ @@ -13,7 +13,7 @@ EstOutput Kulczynski::getValues(vector shared) { try { - int S1, S2, S12, tempA, tempB; + double S1, S2, S12, tempA, tempB; S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; /*S1, S2 = number of OTUs observed or estimated in A and B @@ -33,14 +33,14 @@ EstOutput Kulczynski::getValues(vector shared) { if ((tempA != 0) && (tempB != 0)) { S12++; } } - data[0] = S12 / (float)(S1 + S2 - (2 * S12)); + data[0] = 1.0 - S12 / (float)(S1 + S2 - (2 * S12)); if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; } return data; } catch(exception& e) { - errorOut(e, "Kulczynski", "getValues"); + m->errorOut(e, "Kulczynski", "getValues"); exit(1); } }