[Genabel-commits] r1116 - in pkg/OmicABEL/src/reshuffle: . data_4test

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

Author: sharapovsodbo
Date: 2013-03-07 13:33:41 +0100 (Thu, 07 Mar 2013)
New Revision: 1116

Added:
   pkg/OmicABEL/src/reshuffle/data_4test/
   pkg/OmicABEL/src/reshuffle/data_4test/4test.iout
   pkg/OmicABEL/src/reshuffle/data_4test/4test.out
   pkg/OmicABEL/src/reshuffle/data_4test/data_annotation.txt
   pkg/OmicABEL/src/reshuffle/test.cpp
   pkg/OmicABEL/src/reshuffle/test.h
Modified:
   pkg/OmicABEL/src/reshuffle/Parameters.cpp
   pkg/OmicABEL/src/reshuffle/Parameters.h
   pkg/OmicABEL/src/reshuffle/main.cpp
   pkg/OmicABEL/src/reshuffle/reshuffle.h
Log:
uncomplete <test.h> <test.cpp>

Modified: pkg/OmicABEL/src/reshuffle/Parameters.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-03-06 13:17:59 UTC (rev 1115)
+++ pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-03-07 12:33:41 UTC (rev 1116)
@@ -4,7 +4,7 @@
  *  Created on: 28.02.2013
  *      Author: Sodbo
  */
-#include "Parameters.h"
+#include "parameters.h"
 #include <stdlib.h>
 #include <string>
 using namespace std;
@@ -51,6 +51,9 @@
 	return os;
 }
 
+Parameters::Parameters(){
+}
+
 //Constructor-parser from command line
 Parameter::Parameter(string cmdline, string paramname) {
 

Modified: pkg/OmicABEL/src/reshuffle/Parameters.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.h	2013-03-06 13:17:59 UTC (rev 1115)
+++ pkg/OmicABEL/src/reshuffle/Parameters.h	2013-03-07 12:33:41 UTC (rev 1116)
@@ -40,6 +40,7 @@
 	Parameter heritabilities;
 	Parameter chi;
 	Parameter dataslim;
+	Parameters();
 	Parameters(int, char*[]);		//	Constructor from cmdline
 	static string get_cmd_line(int,char*[]);
 

Added: pkg/OmicABEL/src/reshuffle/data_4test/4test.iout
===================================================================
(Binary files differ)


Property changes on: pkg/OmicABEL/src/reshuffle/data_4test/4test.iout
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/OmicABEL/src/reshuffle/data_4test/4test.out
===================================================================
(Binary files differ)


Property changes on: pkg/OmicABEL/src/reshuffle/data_4test/4test.out
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/OmicABEL/src/reshuffle/data_4test/data_annotation.txt
===================================================================
--- pkg/OmicABEL/src/reshuffle/data_4test/data_annotation.txt	                        (rev 0)
+++ pkg/OmicABEL/src/reshuffle/data_4test/data_annotation.txt	2013-03-07 12:33:41 UTC (rev 1116)
@@ -0,0 +1,13 @@
+Annotation of <4test> data
+
+# of traits:5
+# of covariates:2
+# of snps:100
+
+Traits:
+hgta,tga,tca,ldla,hdla
+
+covariates:
+sex,age
+
+SNPs:
\ No newline at end of file

Modified: pkg/OmicABEL/src/reshuffle/main.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/main.cpp	2013-03-06 13:17:59 UTC (rev 1115)
+++ pkg/OmicABEL/src/reshuffle/main.cpp	2013-03-07 12:33:41 UTC (rev 1116)
@@ -7,18 +7,21 @@
 #include <iostream>
 #include <ctime>
 #include "iout_file.h"
-#include "Parameters.h"
+#include "parameters.h"
 #include "Reshuffle.h"
 #include <iterator>
+#include "test.h"
 //TODO Create Makefile
 
 using namespace std;
 
 int main(int argc, char* argv[]) {
-	cout << "Every day I'm [re]shuffling!" << endl;
+	cout << "Every day I'm [re]shuf1fling!" << endl;
+	parameters_test test(2);
 	Parameters Params(argc, argv);
 	if(Params.info.use)
 		cout << Params;
+	cout<<"SHETT";
 	iout_file iout_F(Params);
 	cout << "finish iout_file read " << double(clock()) / CLOCKS_PER_SEC << endl;
 	if(Params.info.use){

Modified: pkg/OmicABEL/src/reshuffle/reshuffle.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/reshuffle.h	2013-03-06 13:17:59 UTC (rev 1115)
+++ pkg/OmicABEL/src/reshuffle/reshuffle.h	2013-03-07 12:33:41 UTC (rev 1116)
@@ -7,7 +7,7 @@
 
 #ifndef RESHUFFLE_H_
 #define RESHUFFLE_H_
-#include "Parameters.h"
+#include "parameters.h"
 #include "iout_file.h"
 
 using namespace std;

Added: pkg/OmicABEL/src/reshuffle/test.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/test.cpp	                        (rev 0)
+++ pkg/OmicABEL/src/reshuffle/test.cpp	2013-03-07 12:33:41 UTC (rev 1116)
@@ -0,0 +1,22 @@
+/*
+ * test.cpp
+ *
+ *  Created on: 07.03.2013
+ *      Author: lima
+ */
+#include "test.h"
+#include <string.h>
+#include <stdlib.h>
+using namespace std;
+
+parameters_test::parameters_test(int a){
+	cout<<"START TEST"<<endl;
+	string cmdline_1="4test--datadims--snps=1-100,50-150,229--traits=1-3,2-5,10";
+	int argc_1=2;
+	char *argv_1[2];
+	argv_1[1] = new char[cmdline_1.length()+1];
+	strcpy(argv_1[1], cmdline_1.c_str());
+	Params_1=Parameters(argc_1,argv_1);
+}
+
+

Added: pkg/OmicABEL/src/reshuffle/test.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/test.h	                        (rev 0)
+++ pkg/OmicABEL/src/reshuffle/test.h	2013-03-07 12:33:41 UTC (rev 1116)
@@ -0,0 +1,25 @@
+/*
+ * test.h
+ *
+ *  Created on: 07.03.2013
+ *      Author: lima
+ */
+
+#ifndef TEST_H_
+#define TEST_H_
+#include "parameters.h"
+
+using namespace std;
+
+class parameters_test{
+
+public:
+	Parameters Params_1;
+	Parameters Params_2;
+	Parameters Params_3;
+	parameters_test(int);
+	void run();
+};
+
+void run();
+#endif /* TEST_H_ */