Merge branch 'fixes-lto'

sdcTools · Mar 5, 2024 · 780361f · 780361f
2 parents ca7dfd9 + 57e1443
commit 780361f
Show file tree

Hide file tree

Showing 13 changed files with 476 additions and 440 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -21,6 +21,10 @@ measure_threshold <- function(data, global_risk_R) {
     .Call(`_sdcMicro_measure_threshold`, data, global_risk_R)
 }
 
+RankSwap <- function(data, data2, g_MissingValue_R, g_TopRatio_R, g_BottomRatio_R, g_K0_R, g_R0_R, g_P_R, seed_R) {
+    .Call(`_sdcMicro_RankSwap`, data, data2, g_MissingValue_R, g_TopRatio_R, g_BottomRatio_R, g_K0_R, g_R0_R, g_P_R, seed_R)
+}
+
 Suda2 <- function(data, g_MissingValueALEX_R, MaxK_R, DisFraction_R, elliot_scores) {
     .Call(`_sdcMicro_Suda2`, data, g_MissingValueALEX_R, MaxK_R, DisFraction_R, elliot_scores)
 }

diff --git a/src/0Main.cpp b/src/0Main.cpp
@@ -13,6 +13,7 @@
  *
  *  The full text of the license is available at http://www.gnu.org/copyleft/lesser.html
  */
+
 #include <Rcpp.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -30,6 +31,7 @@
 //#include <malloc.h>
 //#endif
 //#endif
+
 #include "Framework.h"
 
 // //RankSwapping
@@ -41,13 +43,12 @@ enum{
 #include "RankSwapping.h"
 
 
- //Mdav
-enum{
-   es_NbHashBitXX  = 16,
-   es_NbHashListXX = 1 << es_NbHashBitXX
- };
-#include "Mdav.h"
-
+//Mdav
+//enum{
+//   es_NbHashBitXX  = 16,
+//   es_NbHashListXX = 1 << es_NbHashBitXX
+// };
+//#include "Mdav.h"
 
 //Suda2
 #include "Suda2.h"
@@ -56,9 +57,4 @@ enum{
 
 #include "Measure_Risk.h"
 #include "Measure_Hierarchical.h"
-
 #include "Measure_Threshold.h"
-
-#include "LocalRecProg/kneibmatch.cpp"
-
-