[Genabel-commits] r826 - in pkg/VariABEL/src: ITERlib VARlib

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

Author: maksim
Date: 2011-12-07 12:44:11 +0100 (Wed, 07 Dec 2011)
New Revision: 826

Modified:
   pkg/VariABEL/src/ITERlib/iterator_functions.cpp
   pkg/VariABEL/src/VARlib/gtps_container.h
   pkg/VariABEL/src/VARlib/supplementary_functions.cpp
   pkg/VariABEL/src/VARlib/supplementary_functions.h
   pkg/VariABEL/src/VARlib/var_homogeneity_test_C.cpp
Log:
fixed some bugs

Modified: pkg/VariABEL/src/ITERlib/iterator_functions.cpp
===================================================================
--- pkg/VariABEL/src/ITERlib/iterator_functions.cpp	2011-12-07 11:07:40 UTC (rev 825)
+++ pkg/VariABEL/src/ITERlib/iterator_functions.cpp	2011-12-07 11:44:11 UTC (rev 826)
@@ -517,7 +517,6 @@
 
 //	std::cout<<"variance_homogeneity_test_C_wrapper: 1\n";
 	
-	static int jj=0;
 
 
 	variance_homogeneity_test_C(indata, trait, design_matrix_copy, design_matrix, p, &indataHeight, betas, se, chi2, df, residuals,

Modified: pkg/VariABEL/src/VARlib/gtps_container.h
===================================================================
--- pkg/VariABEL/src/VARlib/gtps_container.h	2011-12-07 11:07:40 UTC (rev 825)
+++ pkg/VariABEL/src/VARlib/gtps_container.h	2011-12-07 11:44:11 UTC (rev 826)
@@ -23,6 +23,8 @@
 #include<iostream>
 #include<vector>
 #include<memory>
+#include<R.h>
+#include <Rinternals.h>
 
 
 

Modified: pkg/VariABEL/src/VARlib/supplementary_functions.cpp
===================================================================
--- pkg/VariABEL/src/VARlib/supplementary_functions.cpp	2011-12-07 11:07:40 UTC (rev 825)
+++ pkg/VariABEL/src/VARlib/supplementary_functions.cpp	2011-12-07 11:44:11 UTC (rev 826)
@@ -711,7 +711,7 @@
 	double sum = 0;
 	double mean = my_mean(vec);
 
-	error("error: var: sample has not more than one element")
+	error("error: var: sample has not more than one element");
 
 
 	for(unsigned i=0; i<vec->number ; i++)
@@ -734,7 +734,7 @@
   mean = 0;
 	
 
-	if(vec->number == 0) {Rptintf("error: get_mean: sample does not have any element"); return NA_value;}
+	if(vec->number == 0) {Rprintf("error: get_mean: sample does not have any element"); return NA_value;}
 
 	for(unsigned i=0; i<vec->number ; i++)
 		{

Modified: pkg/VariABEL/src/VARlib/supplementary_functions.h
===================================================================
--- pkg/VariABEL/src/VARlib/supplementary_functions.h	2011-12-07 11:07:40 UTC (rev 825)
+++ pkg/VariABEL/src/VARlib/supplementary_functions.h	2011-12-07 11:44:11 UTC (rev 826)
@@ -27,6 +27,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <Rinternals.h>
+#include <R.h>
 #include <fstream>
 #include <algorithm>
 

Modified: pkg/VariABEL/src/VARlib/var_homogeneity_test_C.cpp
===================================================================
--- pkg/VariABEL/src/VARlib/var_homogeneity_test_C.cpp	2011-12-07 11:07:40 UTC (rev 825)
+++ pkg/VariABEL/src/VARlib/var_homogeneity_test_C.cpp	2011-12-07 11:44:11 UTC (rev 826)
@@ -157,8 +157,8 @@
 	//___________________________________________
 	
 	int p_disp = 2;
-	for(int i=0; i<nids_nona ; i++) design_matrix_copy[i] = design_matrix[i];
-	for(int i=0; i<nids_nona ; i++) design_matrix_copy[i+nids_nona] = design_matrix[i +(p-1)*nids_nona];
+	for(long unsigned int i=0; i<nids_nona ; i++) design_matrix_copy[i] = design_matrix[i];
+	for(long unsigned int i=0; i<nids_nona ; i++) design_matrix_copy[i+nids_nona] = design_matrix[i +(p-1)*nids_nona];
 
 //	for(int i=0; i<2*nids_nona ; i++)
 //		{