[Genabel-commits] r1351 - in pkg/MixABEL: R src/ITERlib src/MXlib

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

Author: lckarssen
Date: 2013-10-29 15:18:28 +0100 (Tue, 29 Oct 2013)
New Revision: 1351

Modified:
   pkg/MixABEL/R/fgls.R
   pkg/MixABEL/src/ITERlib/iterator.cpp
   pkg/MixABEL/src/ITERlib/iterator_functions.cpp
   pkg/MixABEL/src/MXlib/fgls.cpp
   pkg/MixABEL/src/MXlib/fglsWrapper.cpp
Log:
Continuation of svn r1344: because the Rstaff.h file was renamed to Rstuff.h and the MixABEL DAlib directory is a symlink to the one in the DatABEL directory we need to change the calls to the .h file here as well.



Modified: pkg/MixABEL/R/fgls.R
===================================================================
--- pkg/MixABEL/R/fgls.R	2013-10-20 12:39:27 UTC (rev 1350)
+++ pkg/MixABEL/R/fgls.R	2013-10-29 14:18:28 UTC (rev 1351)
@@ -362,7 +362,7 @@
 	}
 	#print(finaldata)
 	
-# pre-compute different staff
+# pre-compute different stuff
 	
 	fixed_df <- sum(finaldata$snpinvolved>0)
 	

Modified: pkg/MixABEL/src/ITERlib/iterator.cpp
===================================================================
--- pkg/MixABEL/src/ITERlib/iterator.cpp	2013-10-20 12:39:27 UTC (rev 1350)
+++ pkg/MixABEL/src/ITERlib/iterator.cpp	2013-10-29 14:18:28 UTC (rev 1351)
@@ -1,5 +1,5 @@
 #include <stdarg.h>
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include "iterator_functions.h"
 #include "iterator.h"
 
@@ -379,7 +379,7 @@
 
 	/**
 	// OLD STUFF BELOW HERE:
-	// iterator and other staff
+	// iterator and other stuff
 	SEXP databel_impute_prob_2_databel_mach_dose(SEXP imputedata, SEXP OutFileName, SEXP CacheSizeMb)
 	{
 		CHECK_PTR(imputedata);

Modified: pkg/MixABEL/src/ITERlib/iterator_functions.cpp
===================================================================
--- pkg/MixABEL/src/ITERlib/iterator_functions.cpp	2013-10-20 12:39:27 UTC (rev 1350)
+++ pkg/MixABEL/src/ITERlib/iterator_functions.cpp	2013-10-29 14:18:28 UTC (rev 1351)
@@ -1,4 +1,4 @@
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include "iterator_functions.h"
 
 #ifdef __cplusplus

Modified: pkg/MixABEL/src/MXlib/fgls.cpp
===================================================================
--- pkg/MixABEL/src/MXlib/fgls.cpp	2013-10-20 12:39:27 UTC (rev 1350)
+++ pkg/MixABEL/src/MXlib/fgls.cpp	2013-10-29 14:18:28 UTC (rev 1351)
@@ -387,7 +387,7 @@
 
 			//gsl_matrix_memcpy(V,tXW_diag_sigma2vec_X);
 
-			// here should compute all the staff
+			// here should compute all the stuff
 
 			gsl_matrix_free(tXW_diag_sigma2vec);
 			gsl_matrix_free(XpWXm1_tXW_diag_sigma2vec_X);

Modified: pkg/MixABEL/src/MXlib/fglsWrapper.cpp
===================================================================
--- pkg/MixABEL/src/MXlib/fglsWrapper.cpp	2013-10-20 12:39:27 UTC (rev 1350)
+++ pkg/MixABEL/src/MXlib/fglsWrapper.cpp	2013-10-29 14:18:28 UTC (rev 1351)
@@ -1,5 +1,5 @@
 
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include "iterator_functions.h"
 #include "iterator.h"
 #include "fgls.h"