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

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

Author: sharapovsodbo
Date: 2013-06-30 17:02:23 +0200 (Sun, 30 Jun 2013)
New Revision: 1260

Modified:
   pkg/OmicABEL/src/reshuffle/Parameters.cpp
   pkg/OmicABEL/src/reshuffle/iout_file.cpp
   pkg/OmicABEL/src/reshuffle/iout_file.h
   pkg/OmicABEL/src/reshuffle/reshuffle.cpp
Log:
ver 0.008 
-fixed bug for reshuffling big data.
-fixed some comments (grammatic errors) 



Modified: pkg/OmicABEL/src/reshuffle/Parameters.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-06-29 22:47:12 UTC (rev 1259)
+++ pkg/OmicABEL/src/reshuffle/Parameters.cpp	2013-06-30 15:02:23 UTC (rev 1260)
@@ -62,7 +62,7 @@
 Parameters::Parameters(){
 }
 
-//Constructor-parser from command line
+//Constructor-Parser from command line
 Parameter::Parameter(string cmdline, string paramname,string ofile) {
 
 	name = paramname;

Modified: pkg/OmicABEL/src/reshuffle/iout_file.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/iout_file.cpp	2013-06-29 22:47:12 UTC (rev 1259)
+++ pkg/OmicABEL/src/reshuffle/iout_file.cpp	2013-06-30 15:02:23 UTC (rev 1260)
@@ -78,8 +78,8 @@
 	os <<"NUMBER OF TRAITNAMES\t"<<(*labels.trait_names).size()<<endl;
 }
 
-int iout_file::tilecoordinates(int traitNo, int snpNo) {
-	int tileCoor = 0;
+int64_t iout_file::tilecoordinates(int traitNo, int snpNo) {
+	int64_t tileCoor = 0;
 	int t_tile = traitNo / header.tile_t;
 	int t_off = traitNo % header.tile_t;
 	int m_tile = snpNo / header.tile_m;

Modified: pkg/OmicABEL/src/reshuffle/iout_file.h
===================================================================
--- pkg/OmicABEL/src/reshuffle/iout_file.h	2013-06-29 22:47:12 UTC (rev 1259)
+++ pkg/OmicABEL/src/reshuffle/iout_file.h	2013-06-30 15:02:23 UTC (rev 1260)
@@ -53,6 +53,6 @@
 	iout_header header;
 	labels_data labels;
 	iout_file(Parameters &);
-	int tilecoordinates(int, int);
+	int64_t tilecoordinates(int, int);
 };
 #endif /* IOUT_FILE_H_ */

Modified: pkg/OmicABEL/src/reshuffle/reshuffle.cpp
===================================================================
--- pkg/OmicABEL/src/reshuffle/reshuffle.cpp	2013-06-29 22:47:12 UTC (rev 1259)
+++ pkg/OmicABEL/src/reshuffle/reshuffle.cpp	2013-06-30 15:02:23 UTC (rev 1260)
@@ -81,12 +81,13 @@
 	data << endl;
 	for (set<int>::iterator trait= (*p_Parameters).traits.numbersset.begin();trait!=(*p_Parameters).traits.numbersset.end();trait++) {
 		double* buf = new double[per_trait_per_snp];
-		int oldPos = 0;
+		int64_t oldPos = 0;
 		char s[30];
+		int64_t pos;
 		for (set<int>::iterator snp= (*p_Parameters).snps.numbersset.begin();snp!=(*p_Parameters).snps.numbersset.end();snp++) {
 			data << (*(*p_iout_file).labels.snp_names)[*snp] << "\t";
 			data << (*(*p_iout_file).labels.trait_names)[*trait]<<"\t";
-			int pos = (*p_iout_file).tilecoordinates(*trait, *snp);
+			pos = (*p_iout_file).tilecoordinates(*trait, *snp);
 			//cout << oldPos << "-" << pos << endl;
 			if(pos != oldPos)
 			{