X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=simpson.cpp;h=edc35bd6c04f42c3d687dce377df6b6442e36a18;hp=8e176cf926f07e899d3a965500a991bfde45f3a1;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=9a339a6b007b23c39b7eb20cc777af66dd2cebef diff --git a/simpson.cpp b/simpson.cpp index 8e176cf..edc35bd 100644 --- a/simpson.cpp +++ b/simpson.cpp @@ -28,13 +28,13 @@ EstOutput Simpson::getValues(SAbundVector* rank){ if(sobs != 0){ double simnum=0.0000; - for(int i=1;i<=maxRank;i++){ + for(unsigned long long i=1;i<=maxRank;i++){ simnum += (double)(rank->get(i)*i*(i-1)); } simpson = simnum / (sampled*(sampled-1)); - for(int i=1;i<=maxRank;i++){ + for(unsigned long long i=1;i<=maxRank;i++){ double piI = (double) i / (double)sampled; firstTerm += rank->get(i) * pow(piI, 3); secondTerm += rank->get(i) * pow(piI, 2); @@ -58,7 +58,7 @@ EstOutput Simpson::getValues(SAbundVector* rank){ return data; } catch(exception& e) { - errorOut(e, "Simpson", "getValues"); + m->errorOut(e, "Simpson", "getValues"); exit(1); } }