X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.h;fp=mothur.h;h=25b803fa393e27d0c2811e62efdeb042ce390dec;hb=0cefb55a2616975bd4a144fc345693695ffc9bb6;hp=2c143e8667786c5740f0aa6324ea4062eab66b76;hpb=44f3a3c81a34fdee62550d98838a4b421e8df08e;p=mothur.git diff --git a/mothur.h b/mothur.h index 2c143e8..25b803f 100644 --- a/mothur.h +++ b/mothur.h @@ -88,6 +88,7 @@ using namespace std; typedef unsigned long ull; +typedef unsigned short intDist; struct IntNode { int lvalue; @@ -119,7 +120,13 @@ struct diffPair { reverseProb = rp; } }; - +/***********************************************************************/ +struct PDistCell{ + ull index; + float dist; + PDistCell() : index(0), dist(0) {}; + PDistCell(ull c, float d) : index(c), dist(d) {} +}; /************************************************************/ struct clusterNode { int numSeq; @@ -158,10 +165,14 @@ struct spearmanRank { spearmanRank(string n, float s) : name(n), score(s) {} }; +//*********************************************************************** +inline bool compareIndexes(PDistCell left, PDistCell right){ + return (left.index > right.index); +} //******************************************************************************************************************** //sorts highest to lowest inline bool compareSpearman(spearmanRank left, spearmanRank right){ - return (left.score > right.score); + return (left.score < right.score); } //******************************************************************************************************************** //sorts highest to lowest