Merge branch 'master' of github.com:genetics-statistics/GEMMA

1 files changed, 36 insertions, 44 deletions

diff --git a/src/prdt.h b/src/prdt.h
index 0939b36..571fdb8 100644
--- a/src/prdt.h
+++ b/src/prdt.h
@@ -19,58 +19,50 @@
 #ifndef __PRDT_H__
 #define __PRDT_H__
 
-#include <vector>
-#include <map>
-#include <string.h>
-#include "gsl/gsl_vector.h"
 #include "gsl/gsl_matrix.h"
+#include "gsl/gsl_vector.h"
 #include "param.h"
+#include <map>
+#include <string.h>
+#include <vector>
 
 using namespace std;
 
 class PRDT {
 
 public:
-	// IO-related parameters.
-	size_t a_mode;
-	size_t d_pace;
-
-	string file_bfile;
-	string file_geno;
-	string file_out;
-	string path_out;
-
-	vector<vector<int> > indicator_pheno;
-	vector<int> indicator_cvt;
-	vector<int> indicator_idv;
-	vector<SNPINFO> snpInfo;
-	map<string, double> mapRS2est;
-
-	size_t n_ph;
-	size_t np_obs, np_miss;
-	size_t ns_total;
-	size_t ns_test;
-
-	double time_eigen;
-
-	// Main functions.
-	void CopyFromParam (PARAM &cPar);
-	void CopyToParam (PARAM &cPar);
-	void WriteFiles (gsl_vector *y_prdt);
-	void WriteFiles (gsl_matrix *Y_full);
-	void AddBV (gsl_matrix *G, const gsl_vector *u_hat,
-		    gsl_vector *y_prdt);
-	void AnalyzeBimbam (gsl_vector *y_prdt);
-	void AnalyzePlink (gsl_vector *y_prdt);
-	void MvnormPrdt (const gsl_matrix *Y_hat, const gsl_matrix *H,
-			 gsl_matrix *Y_full);
+  // IO-related parameters.
+  size_t a_mode;
+  size_t d_pace;
+
+  string file_bfile;
+  string file_geno;
+  string file_out;
+  string path_out;
+
+  vector<vector<int>> indicator_pheno;
+  vector<int> indicator_cvt;
+  vector<int> indicator_idv;
+  vector<SNPINFO> snpInfo;
+  map<string, double> mapRS2est;
+
+  size_t n_ph;
+  size_t np_obs, np_miss;
+  size_t ns_total;
+  size_t ns_test;
+
+  double time_eigen;
+
+  // Main functions.
+  void CopyFromParam(PARAM &cPar);
+  void CopyToParam(PARAM &cPar);
+  void WriteFiles(gsl_vector *y_prdt);
+  void WriteFiles(gsl_matrix *Y_full);
+  void AddBV(gsl_matrix *G, const gsl_vector *u_hat, gsl_vector *y_prdt);
+  void AnalyzeBimbam(gsl_vector *y_prdt);
+  void AnalyzePlink(gsl_vector *y_prdt);
+  void MvnormPrdt(const gsl_matrix *Y_hat, const gsl_matrix *H,
+                  gsl_matrix *Y_full);
 };
 
 #endif
-
-
-
-
-
-
-