X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=linearalgebra.h;h=3c86cb1de9fb697bac4aae04adc298c8994b4e83;hb=3914b0d6480f67df53b1e838f51c4e6155710434;hp=ef9e03cde900b4e01bdd61a99083801c0d25b913;hpb=4a760c2d164aa955dee7d3d38da323822763d906;p=mothur.git

diff --git a/linearalgebra.h b/linearalgebra.h
index ef9e03c..3c86cb1 100644
--- a/linearalgebra.h
+++ b/linearalgebra.h
@@ -29,6 +29,8 @@ public:
 	double calcPearson(vector<vector<double> >&, vector<vector<double> >&);
 	double calcSpearman(vector<vector<double> >&, vector<vector<double> >&);
 	double calcKendall(vector<vector<double> >&, vector<vector<double> >&);
+    double calcKruskalWallis(vector<spearmanRank>&, double&);
+    double calcWilcoxon(vector<double>&, vector<double>&, double&);
 	
 	double calcPearson(vector<double>&, vector<double>&, double&);
 	double calcSpearman(vector<double>&, vector<double>&, double&);
@@ -39,8 +41,9 @@ public:
     double calcKendallSig(double, double); //length, coeff.
     
     vector<double> solveEquations(vector<vector<double> >, vector<double>);
+    vector<float> solveEquations(vector<vector<float> >, vector<float>);
     vector<vector<double> > getInverse(vector<vector<double> >);
-
+    double choose(double, double);
     
 private:
 	MothurOut* m;
@@ -49,11 +52,12 @@ private:
     double betacf(const double, const double, const double);
     double betai(const double, const double, const double);
     double gammln(const double);
-    double gammp(const double, const double);
     double gammq(const double, const double);
     double gser(double&, const double, const double, double&);
     double gcf(double&, const double, const double, double&);
     double erfcc(double);
+    double gammp(const double, const double);
+    double pnorm(double x);
     
     double ran0(int&); //for testing 
     double ran1(int&); //for testing
@@ -64,7 +68,11 @@ private:
     
     void ludcmp(vector<vector<double> >&, vector<int>&, double&);
     void lubksb(vector<vector<double> >&, vector<int>&, vector<double>&);
-
+    
+    void ludcmp(vector<vector<float> >&, vector<int>&, float&);
+    void lubksb(vector<vector<float> >&, vector<int>&, vector<float>&);
+    
+    
     
 };