try to fix LocalRecProg

sdcTools · Feb 13, 2024 · 368b363 · 368b363
1 parent 2bc479d
commit 368b363
Show file tree

Hide file tree

Showing 5 changed files with 231 additions and 201 deletions.
diff --git a/R/LocalRecProg.R b/R/LocalRecProg.R
@@ -146,7 +146,7 @@ LocalRecProgWORK <- function(data, categorical, numerical=NULL, ancestors=NULL,
 
   dataX <- as.matrix(data[, c(categorical, numerical, ancestors), drop=FALSE])
 
-  res <- .Call("LocalRecProg_cpp", dataX, k_level, FindLowestK, ancestor_settings, weight, range,
+  res <- "LocalRecProg_cpp"(dataX, k_level, FindLowestK, ancestor_settings, weight, range,
     FALSE, lowMemory, missingValue)
   colnames(res$Res) <- paste(c(categorical, numerical), "_lr", sep="")
   cbind(data[, c(categorical, numerical)], res$Res)

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,6 +1,10 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
+LocalRecProg_cpp <- function(data, K_Level_R, FindLowestK_R, ancestor_R, weight_R, range_R, categoryCount_R, LowMemory_R, g_MissingValue_R) {
+    .Call(`_sdcMicro_LocalRecProg_cpp`, data, K_Level_R, FindLowestK_R, ancestor_R, weight_R, range_R, categoryCount_R, LowMemory_R, g_MissingValue_R)
+}
+
 Mdav <- function(data, data2, g_MissingValue_R, weights_R, g_K_R) {
     .Call(`_sdcMicro_Mdav`, data, data2, g_MissingValue_R, weights_R, g_K_R)
 }

diff --git a/src/LocalRecProg/kneibmatch.cpp b/src/LocalRecProg/kneibmatch.cpp
@@ -48,200 +48,3 @@ enum EMatch
   e_Match_Kneib
 };
 
-
-RcppExport SEXP LocalRecProg_cpp(SEXP data, SEXP K_Level_R, SEXP FindLowestK_R, SEXP ancestor_R, SEXP weight_R, SEXP range_R, SEXP categoryCount_R, SEXP LowMemory_R, SEXP g_MissingValue_R)
-{
-BEGIN_RCPP
-  int i, j;
-  int c2;
-  int K_Level;
-  //uint TimeStart = TimeGetMilliSecond(), TimeMid;
-  EMatch Match = e_Match_Complete;
-  BOOL FindLowestK = FALSE, LowMemory = FALSE;
-
-    //============= Init
-  Uninit_LocalRec();
-
-  g_Debug_LocalRec = FALSE;
-  g_Output = e_Output_Average;
-  g_Epsilon = es_Epsilon;
-
-  Rcpp::NumericMatrix Mat_LocalRec(data);  // creates Rcpp matrix from SEXP
-  g_NbRow_LocRec = Mat_LocalRec.rows();
-  int NbVar_LocRec = Mat_LocalRec.cols();
-  // NbVar_LocRec = NbTotalVar / 2;
-  //=============init Parameters
-  K_Level = Rcpp::as<int>(K_Level_R);
-  if(K_Level >= 1) Match = e_Match_Kneib;
-  if(Rcpp::as<bool>(range_R)) g_Output = e_Output_Range;
-  FindLowestK = Rcpp::as<bool>(FindLowestK_R);
-  LowMemory = Rcpp::as<bool>(LowMemory_R);
-  double g_MissingValue_LocalRec = Rcpp::as<double>(g_MissingValue_R);
-  if(g_MissingValue_LocalRec == 0) g_MissingValue_LocalRec = -1.0f;
-  // Ancestors
-  // 1. Column: Position of the variable with ancestor variables (0-based)
-  // 2. Column: number of ancestor variables
-  Rcpp::NumericMatrix ancestors(ancestor_R);
-  int ancestorLen = ancestors.rows();
-  int ancestorCol = ancestors.cols();
-  if(ancestorLen > 1 && ancestorCol>1)
-  {
-    for(j=0; j < ancestorLen; j++)
-    {
-      NbVar_LocRec -= ancestors(j,1);
-    }
-    // NbVar_LocRec = NbTotalVar / 2;
-    // NbVar_LocRec: position of the first ancestor variable
-    // ancestors: ancestor array
-    CData::InitAncestors(NbVar_LocRec, ancestors);
-  }
-  Rcpp::NumericMatrix res(g_NbRow_LocRec, NbVar_LocRec); // result matrix that is returned
-
-  // weight-vector:
-  // 1. Column: Value of the weight for the variable
-  // 2. Column: TRUE/FALSE if variable is of type categorial
-  Rcpp::NumericMatrix weight(weight_R);
-  if(NbVar_LocRec == weight.rows()) {
-    CData::Init(NbVar_LocRec, weight);
-  } else {
-    Uninit_LocalRec();
-    return Rcpp::wrap("Error: Not enough weights specified");
-  }
-
-  bool categoryCount = Rcpp::as<bool>(categoryCount_R);
-  if(categoryCount) {
-    CData::m_CategoryCountVar = TRUE;
-    --NbVar_LocRec;
-  }
-  if (g_NbRow_LocRec <= 0 || CData::m_NbVariable <= 0)
-  {
-    Uninit_LocalRec();
-    return Rcpp::wrap(-3);
-  }
-
-  if (Match == e_Match_Kneib
-    && (K_Level >= g_NbRow_LocRec || K_Level < 1))
-  {
-    Uninit_LocalRec();
-    return Rcpp::wrap(-4);
-  }
-    //============= Data Allocation & Loading
-  g_Data = new CData[g_NbRow_LocRec];
-
-  if (LoadData(g_NbRow_LocRec, g_MissingValue_LocalRec, g_Data, Mat_LocalRec) != g_NbRow_LocRec)
-  {
-    Uninit_LocalRec();
-    return Rcpp::wrap(-5);
-  }
-
-  if (!LowMemory && g_NbRow_LocRec > 1 && CData::m_NbVariable > 2)
-  {
-    TDist *pAllDist = new TDist[g_NbRow_LocRec * (g_NbRow_LocRec - 1) / 2];
-    int NbEntry = 0;
-
-    ForLoop (i, g_NbRow_LocRec)
-    {
-      g_Data[i].m_pDist = pAllDist + NbEntry;
-
-      int NbDist = g_NbRow_LocRec - i - 1;
-
-      ForLoop (j, NbDist)
-        g_Data[i].m_pDist[j] = dist(g_Data + i, g_Data + i + j + 1);
-
-      --g_Data[i].m_pDist;    //Optim: avoid to have to do it each time dist() is called
-      NbEntry += NbDist;
-    }
-
-    CData::m_pAllDist = pAllDist;
-
-  }
-  g_Vertex = MALLOC(vertex_type, (((long)g_NbRow_LocRec) * 3) / 2);
-  for (i = 0; i < g_NbRow_LocRec; ++i)
-    g_Vertex[i].item = (g_Data + i);
-  g_Match = MALLOC(int, g_NbRow_LocRec);
-    //============= Main Algo
-  int K0 = 1,
-    Km = 1;
-
-  while (1)
-  {
-    if (Match == e_Match_Kneib)
-    {
-      CleanDeleteT(g_AdjType);
-      g_AdjType = MALLOC(adj_type, 2 * ((long)g_NbRow_LocRec) * K_Level);
-    }
-
-    g_Diameter = diameter(g_Data, g_NbRow_LocRec);
-    if (Match == e_Match_Kneib)
-    {
-      make_adj(g_Vertex, g_NbRow_LocRec, K_Level, g_AdjType);
-    }
-    if (Match == e_Match_Kneib)
-      g_ShiftBound = SHIFT(UPPERBOUND);
-    else
-      g_ShiftBound = 0;
-    if (Match == e_Match_Kneib){
-      NSKneib::weighted(g_Vertex, g_NbRow_LocRec, g_Vertex + g_NbRow_LocRec);
-    }else{
-      NSComplete::weighted(g_Vertex, g_NbRow_LocRec, g_Vertex + g_NbRow_LocRec);
-    }
-    if (Match != e_Match_Kneib || !FindLowestK)
-      break;
-    j = 0;
-
-    ForLoop (i, g_NbRow_LocRec)
-    {
-      if (g_Vertex[i].partner == NULL)
-        ++j;
-    }
-
-    int PrevK = K_Level;
-
-    if (j > 1)
-    {
-      K0 = K_Level;
-
-      if (Km == 1)
-        K_Level *= 5;
-      else
-        K_Level = (Km + K_Level + 1) / 2;
-    }
-    else
-    {
-      if (Km > K_Level)
-        Km = K_Level;
-      K_Level = (K0 + K_Level + 1) / 2;
-    }
-    if (K_Level < K0 + 1
-      || K_Level == PrevK)
-    {
-      break;
-    }
-  }
-  BOOL Done = FALSE;
-
-  if (Match == e_Match_Kneib)
-  {
-    Done = NSKneib::match_check(g_Vertex, g_NbRow_LocRec) >= 0
-      && NSKneib::dual_check(g_Vertex, g_NbRow_LocRec, g_Vertex + g_NbRow_LocRec);
-  }
-  else
-  {
-    Done = NSComplete::match_check(g_Vertex, g_NbRow_LocRec) >= 0
-      && NSComplete::dual_check(g_Vertex, g_NbRow_LocRec, g_Vertex + g_NbRow_LocRec);
-  }
-  if (Done)
-  //if (1)
-  {
-    c2 = get_matching(g_Vertex, g_NbRow_LocRec, g_Match);
-    sum_matching(g_Vertex, g_Match, c2);
-    write_matching(g_Vertex, g_NbRow_LocRec, g_Match, c2, res);
-  }
-    //============= Uninit_LocalRec
-  Uninit_LocalRec();
-  return Rcpp::List::create(
-    Rcpp::Named( "Res" ) = res
-  ) ;
-
-  END_RCPP
-}