[Genabel-commits] r1283 - pkg/OmicABEL/src/reshuffle

[noreply at r-forge.r-project.org]

Author: sharapovsodbo
Date: 2013-08-05 09:45:30 +0200 (Mon, 05 Aug 2013)
New Revision: 1283

Modified:
   pkg/OmicABEL/src/reshuffle/Parameters.cpp
   pkg/OmicABEL/src/reshuffle/Parameters.h
   pkg/OmicABEL/src/reshuffle/main.cpp
   pkg/OmicABEL/src/reshuffle/reshuffle.cpp
Log:
--ver 0.012
heritabilities works correctly
dataslim works incorrect
TODO: fix bug with --dataslim option

Modified: pkg/OmicABEL/src/reshuffle/Parameters.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-08-05 05:51:47 UTC (rev 1282)
+++ pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-08-05 07:45:30 UTC (rev 1283)
@@ -142,7 +142,7 @@
 	cmdline.erase(0,seppos);//Erase file name
 	iout_fname = filename + ".iout";
 	out_fname = filename + ".out";
-	h = Parameter(cmdline,"h","");
+	//h = Parameter(cmdline,"h","");
 	help = Parameter(cmdline,"help","");
 	info = Parameter(cmdline, "info","");
 	cmdline=info.delfromcmdline(cmdline);

Modified: pkg/OmicABEL/src/reshuffle/Parameters.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.h	2013-08-05 05:51:47 UTC (rev 1282)
+++ pkg/OmicABEL/src/reshuffle/Parameters.h	2013-08-05 07:45:30 UTC (rev 1283)
@@ -35,7 +35,7 @@
 public:
 	string iout_fname; //iout_file_name
 	string out_fname;
-	Parameter h; //Print help
+	//Parameter h; //Print help
 	Parameter help; //Print help
 	Parameter info; // Write info about progeamm's run
 	Parameter datadims;

Modified: pkg/OmicABEL/src/reshuffle/main.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/main.cpp	2013-08-05 05:51:47 UTC (rev 1282)
+++ pkg/OmicABEL/src/reshuffle/main.cpp	2013-08-05 07:45:30 UTC (rev 1283)
@@ -16,7 +16,7 @@
 int main(int argc, char* argv[]) {
 	//cout<<"Start reshuffeling"<<endl;
 	Parameters Params(argc, argv);
-	if((Params.h.use||Params.help.use||(Params.iout_fname==".iout"&&Params.out_fname==".out"))&&(!Params.test.use)){
+	if((Params.help.use||(Params.iout_fname==".iout"&&Params.out_fname==".out"))&&(!Params.test.use)){
 		cout<<"Available commands"<<endl<<endl;
 		cout<<" --datadims | to get data's dimension"<<endl<<endl;
 		cout<<" --snpnames=<indexes> | to get names of SNP by indexes"<<endl<<endl;

Modified: pkg/OmicABEL/src/reshuffle/reshuffle.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/reshuffle.cpp	2013-08-05 05:51:47 UTC (rev 1282)
+++ pkg/OmicABEL/src/reshuffle/reshuffle.cpp	2013-08-05 07:45:30 UTC (rev 1283)
@@ -270,9 +270,9 @@
 		txt_est << (*(p_iout_file->labels.trait_names))[*trait] << "\t";
 	txt_est << endl;
 	list<string> est_names;
-	est_names.insert(est_names.end(), "heritabilities");
-	est_names.insert(est_names.end(), "sigma");
-	est_names.insert(est_names.end(), "res_sigma");
+	est_names.insert(est_names.end(), "h2");
+	est_names.insert(est_names.end(), "var");
+	est_names.insert(est_names.end(), "resVar");
 	double tmp_number = 0;
 	int counter=0;
 	for (list<string>::iterator name = est_names.begin();name != est_names.end(); ++name) {