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

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

Author: sharapovsodbo
Date: 2013-03-13 07:09:22 +0100 (Wed, 13 Mar 2013)
New Revision: 1134

Added:
   pkg/OmicABEL/src/reshuffle/makereshuffle
Modified:
   pkg/OmicABEL/src/reshuffle/Parameters.cpp
   pkg/OmicABEL/src/reshuffle/main.cpp
   pkg/OmicABEL/src/reshuffle/reshuffle.h
   pkg/OmicABEL/src/reshuffle/test.cpp
   pkg/OmicABEL/src/reshuffle/test.h
Log:
ver 0.004 makefile+resolved problem of compiling in *unix systems



Modified: pkg/OmicABEL/src/reshuffle/Parameters.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-03-12 12:50:00 UTC (rev 1133)
+++ pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-03-13 06:09:22 UTC (rev 1134)
@@ -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;

Modified: pkg/OmicABEL/src/reshuffle/main.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/main.cpp	2013-03-12 12:50:00 UTC (rev 1133)
+++ pkg/OmicABEL/src/reshuffle/main.cpp	2013-03-13 06:09:22 UTC (rev 1134)
@@ -7,8 +7,8 @@
 #include <iostream>
 #include <ctime>
 #include "iout_file.h"
-#include "parameters.h"
-#include "Reshuffle.h"
+#include "Parameters.h"
+#include "reshuffle.h"
 #include <iterator>
 #include "test.h"
 //TODO Create Makefile
@@ -20,11 +20,9 @@
 	Parameters Params(argc, argv);
 	//mkdir("TEST");
 	if(Params.test.use){
-
 		test t_datadims("datadims","--datadims--","datadims.txt","data_4test_check/datadims.txt");
 		t_datadims.run();
 		remove(t_datadims.result.c_str());
-
 		test t_snpnamesdef("snpnamesdef","--snpnames--","snpnames.txt","data_4test_check/snpnamesdef.txt");
 		t_snpnamesdef.run();
 		remove(t_snpnamesdef.result.c_str());
@@ -114,5 +112,5 @@
 	Reshuffle reshh(iout_F,Params);
 	reshh.run();
 	cout << "finish_reshuffling " << double(clock()) / CLOCKS_PER_SEC << endl;
-	return 0;
+	return (0);
 }

Added: pkg/OmicABEL/src/reshuffle/makereshuffle
===================================================================
--- pkg/OmicABEL/src/reshuffle/makereshuffle	                        (rev 0)
+++ pkg/OmicABEL/src/reshuffle/makereshuffle	2013-03-13 06:09:22 UTC (rev 1134)
@@ -0,0 +1,2 @@
+all:
+	g++ main.cpp iout_file.cpp Parameters.cpp reshuffle.cpp test.cpp -Wall -o reshuffle
\ No newline at end of file

Modified: pkg/OmicABEL/src/reshuffle/reshuffle.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/reshuffle.h	2013-03-12 12:50:00 UTC (rev 1133)
+++ pkg/OmicABEL/src/reshuffle/reshuffle.h	2013-03-13 06:09:22 UTC (rev 1134)
@@ -7,7 +7,7 @@
 
 #ifndef RESHUFFLE_H_
 #define RESHUFFLE_H_
-#include "parameters.h"
+#include "Parameters.h"
 #include "iout_file.h"
 
 using namespace std;

Modified: pkg/OmicABEL/src/reshuffle/test.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/test.cpp	2013-03-12 12:50:00 UTC (rev 1133)
+++ pkg/OmicABEL/src/reshuffle/test.cpp	2013-03-13 06:09:22 UTC (rev 1134)
@@ -12,7 +12,7 @@
 
 ofstream test_txt("test.txt");
 test::test(string Name,string cmd,string Result,string Check){
-
+	Params_test= new Parameters;
 	name=Name;
 	result=Result;
 	check=Check;
@@ -45,11 +45,9 @@
 		Params_test->dataslim = Parameter(cmd,"dataslim");
 		Params_test->chi = Parameter(cmd,"chi");
 	}
-
 }
 
 void test::run(){
-
 	test_txt<<"START TEST "<<name<<"\t";
 	iout_file iout_F(*Params_test);
 	if(Params_test->traits.use)
@@ -60,8 +58,6 @@
 		Params_test->heritabilities.setbynames(*(iout_F.labels.trait_names));
 	Reshuffle reshh(iout_F,*Params_test);
 	reshh.run();
-	//result="datadims/datadims.txt";
-	//check="data_4test_check/datadims/datadims.txt";
 	ifstream result_f(result.c_str());
 	ifstream check_f(check.c_str());
 	string str_res="";
@@ -80,7 +76,7 @@
 		test_txt<<"Test "<<name<<" OK"<<endl;
 
 	//TODO: remove doesn't work from test.cpp
-	/*if(remove(result.c_str()) != 0 )
+	/*if(remove(result.c_strf()) != 0 )
 	  cout<<"Error deleting file";*/
 
 }

Modified: pkg/OmicABEL/src/reshuffle/test.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/test.h	2013-03-12 12:50:00 UTC (rev 1133)
+++ pkg/OmicABEL/src/reshuffle/test.h	2013-03-13 06:09:22 UTC (rev 1134)
@@ -7,7 +7,7 @@
 
 #ifndef TEST_H_
 #define TEST_H_
-#include "parameters.h"
+#include "Parameters.h"
 #include "iout_file.h"
 #include "reshuffle.h"
 //#include <dir.h>
@@ -18,9 +18,9 @@
 	string name;
 	string result;
 	string check;
-	Parameters Params;
-	Parameters *Params_test=&Params;
+	Parameters *Params_test;//&Paramss;
 	test(string,string,string,string);
 	void run();
 };
-#endif /* TEST_H_ */
+#endif
+/* TEST_H_ */