changes while testing

[mothur.git] / mothurmetastats.h

diff --git a/mothurmetastats.h b/mothurmetastats.h
index 229ffb65a401b61472dad302677037161ce27642..4d6cf9166816f9f775e97eedc8a3231ec6daecd8 100644 (file)
--- a/mothurmetastats.h
+++ b/mothurmetastats.h
@@ -23,27 +23,26 @@ class MothurMetastats {
        
        private:
                MothurOut* m;
-               int row, column, numPermutations;
+               int row, column, numPermutations, secondGroupingStart;
                double threshold;
-       
+        
+    vector<double> permuted_pvalues(vector< vector<double> >&, vector<double>&, vector< vector<double> >&);
+    vector<double> permute_and_calc_ts(vector< vector<double> >&);
+    
                int start(vector<double>&, int, vector<double>&, vector< vector<double> >&); //Find the initial values for the matrix
                int meanvar(vector<double>&, int, vector<double>&);
                int testp(vector<double>&, vector<double>&, vector<double>&, int, vector<double>&, vector<double>&);
                int permute_matrix(vector<double>&, vector<double>&, int, vector<double>&, vector<double>&, vector<double>&);
                int permute_array(vector<int>&);
                int calc_twosample_ts(vector<double>&, int, vector<double>&, vector<double>&, vector<double>&);
-               vector<double> smoothSpline(vector<double>, vector<double>, int);
+               double smoothSpline(vector<double>&, vector<double>&, int);
                vector<double> calc_qvalues(vector<double>&);
-               vector<double> sknot1(vector<double>);
+               vector<double> sknot1(double*, int);
                int nkn(int);
                int OrderPValues(int, int, vector<double>&, vector<int>&);
                int swapElements(int, int, vector<double>&, vector<int>&);
                vector<int> getSequence(int, int, int);
                
-               int spline(vector<double>&, vector<double>&, int, int, vector<double>&);
-               int splint(vector<double>&, vector<double>&, double&, double&, vector<double>&);
-
-
 };
        
 #endif