fix Rcpp::Rcout

sdcTools · Dec 5, 2023 · 24563b4 · 24563b4
1 parent 2c1cf13
commit 24563b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -229,11 +229,11 @@ END_RCPP
 
 RcppExport SEXP LocalRecProg_cpp(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 RcppExport SEXP Mdav(SEXP, SEXP, SEXP, SEXP, SEXP);
-RcppExport SEXP RankSwap(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
-RcppExport SEXP Suda2(SEXP, SEXP, SEXP, SEXP, SEXP);
 RcppExport SEXP measure_hierachical(SEXP);
 RcppExport SEXP measure_risk_cpp(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 RcppExport SEXP measure_threshold(SEXP, SEXP);
+RcppExport SEXP RankSwap(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
+RcppExport SEXP Suda2(SEXP, SEXP, SEXP, SEXP, SEXP);
 
 static const R_CallMethodDef CallEntries[] = {
     {"_sdcMicro_cpp_calcSuppInds", (DL_FUNC) &_sdcMicro_cpp_calcSuppInds, 3},
@@ -253,11 +253,11 @@ static const R_CallMethodDef CallEntries[] = {
     {"_sdcMicro_test_comparator", (DL_FUNC) &_sdcMicro_test_comparator, 5},
     {"LocalRecProg_cpp",    (DL_FUNC) &LocalRecProg_cpp,    9},
     {"Mdav",                (DL_FUNC) &Mdav,                5},
-    {"RankSwap",            (DL_FUNC) &RankSwap,            9},
-    {"Suda2",               (DL_FUNC) &Suda2,               5},
     {"measure_hierachical", (DL_FUNC) &measure_hierachical, 1},
     {"measure_risk_cpp",    (DL_FUNC) &measure_risk_cpp,    6},
     {"measure_threshold",   (DL_FUNC) &measure_threshold,   2},
+    {"RankSwap",            (DL_FUNC) &RankSwap,            9},
+    {"Suda2",               (DL_FUNC) &Suda2,               5},
     {NULL, NULL, 0}
 };
 

diff --git a/src/Suda2.h b/src/Suda2.h
@@ -769,7 +769,7 @@ void FindMsu(CList<CSudaMsu> &MsuList, CList<CCorrelation> &CorrelationList, CLi
               int VarNum = (k == Msu.m_NbVar) ? ItemI.m_VarNum
                         : ItemList[Msu.m_Var[k].FromItem].m_VarNum;
               if(g_Debug){
-                Rcout << "Add_ Number of NbMsu Per Variable Var" << VarNum+1, << ": ", m / g_pNbCorrelated[k]);
+                Rcpp::Rcout << "Add_ Number of NbMsu Per Variable Var" << VarNum+1 << ": " << m / g_pNbCorrelated[k];
               }
               g_pNbMsuPerVariable[VarNum] += m / g_pNbCorrelated[k];
 
@@ -1095,9 +1095,9 @@ RcppExport SEXP Suda2(SEXP data, SEXP g_MissingValueALEX_R, SEXP MaxK_R, SEXP Di
   int NbUniqueInHash = 1;
   NbUniqueInHash = NbUniqueInHash - 1; // to avoid notes in CRAN checks;
   int NbEmptyHash = 1;
-  NbEmptyHash = NbEmptyHash - 1; // to avoid notes in CRAN checks;  
+  NbEmptyHash = NbEmptyHash - 1; // to avoid notes in CRAN checks;
   int NbTotalDuplicate = 1;
-  NbTotalDuplicate = NbTotalDuplicate - 1; // to avoid notes in CRAN checks;  
+  NbTotalDuplicate = NbTotalDuplicate - 1; // to avoid notes in CRAN checks;
 
   ForLoop (i, es_HashListSize){
     CChainedList &List = g_HashList[i];
@@ -1106,15 +1106,15 @@ RcppExport SEXP Suda2(SEXP data, SEXP g_MissingValueALEX_R, SEXP MaxK_R, SEXP Di
       ++NbEmptyHash;
   }
 
-  int NbNotEmpty = 1; 
-  NbNotEmpty = NbNotEmpty - 1; // to avoid notes in CRAN checks;    
+  int NbNotEmpty = 1;
+  NbNotEmpty = NbNotEmpty - 1; // to avoid notes in CRAN checks;
   int NbDuplicateRemoved = 1;
-  NbDuplicateRemoved = NbDuplicateRemoved - 1; // to avoid notes in CRAN checks;   
+  NbDuplicateRemoved = NbDuplicateRemoved - 1; // to avoid notes in CRAN checks;
   int NbDuplicatePair = 1;
-  NbDuplicatePair = NbDuplicatePair - 1; // to avoid notes in CRAN checks;   
+  NbDuplicatePair = NbDuplicatePair - 1; // to avoid notes in CRAN checks;
   int NbProcessedEntry = 1;
-  NbProcessedEntry = NbProcessedEntry - 1; // to avoid notes in CRAN checks;   
-  
+  NbProcessedEntry = NbProcessedEntry - 1; // to avoid notes in CRAN checks;
+
   ForLoop (i, es_HashListSize){
     CChainedList &List = g_HashList[i];