fixed bug with shhh.flow from file path name in write functions, added "smart" featur...

[mothur.git] / mothur.h

diff --git a/mothur.h b/mothur.h
index 53074eb1e146f28af23a87e6888d57bfaa5184fa..50344e24bfea85e8b7c4b829b5136e3e63d34fc7 100644 (file)
--- a/mothur.h
+++ b/mothur.h
@@ -72,6 +72,8 @@
        #include <windows.h>
        #include <psapi.h>
        #include <direct.h>
+       #include <tchar.h>
+
 #endif
 
 using namespace std;
@@ -83,6 +85,7 @@ using namespace std;
 #define isnan(x) ((x) != (x))
 #define isinf(x) (fabs(x) == std::numeric_limits<double>::infinity())
 
+
 typedef unsigned long ull;
 
 struct IntNode {
@@ -103,6 +106,19 @@ struct ThreadNode {
        IntNode* right;
 };
 
+struct diffPair {
+       float   prob;
+       float   reverseProb;
+       
+       diffPair() {
+               prob = 0; reverseProb = 0;
+       }
+       diffPair(float p, float rp) {
+               prob = p;
+               reverseProb = rp;
+       }
+};
+
 /************************************************************/
 struct clusterNode {
        int numSeq;
@@ -186,7 +202,8 @@ void convert(const string& s, T& x, bool failIfLeftoverChars = true){
                        throw BadConversion(s);
        
 }
-
+//**********************************************************************************************************************
+template <typename T> int sgn(T val){ return (val > T(0)) - (val < T(0)); }
 //**********************************************************************************************************************
 
 template<typename T>