Merge pull request #39 from andyquinterom/T38

feat: Adds subset with limit

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: orbweaver
 Title: Fast and Efficient Graph Data Structures
-Version: 0.17.1
+Version: 0.18.0
 Authors@R: 
     c(person(given = "ixpantia, SRL",
              role = "cph",

R/extendr-wrappers.R

@@ -34,10 +34,10 @@ DirectedGraph$get_all_roots <- function() .Call(wrap__DirectedGraph__get_all_roo
 
 DirectedGraph$get_roots_over <- function(node_ids) .Call(wrap__DirectedGraph__get_roots_over, self, node_ids)
 
-DirectedGraph$subset <- function(node_id) .Call(wrap__DirectedGraph__subset, self, node_id)
-
 DirectedGraph$subset_multi <- function(node_ids) .Call(wrap__DirectedGraph__subset_multi, self, node_ids)
 
+DirectedGraph$subset_multi_with_limit <- function(node_ids, limit) .Call(wrap__DirectedGraph__subset_multi_with_limit, self, node_ids, limit)
+
 DirectedGraph$print <- function() invisible(.Call(wrap__DirectedGraph__print, self))
 
 DirectedGraph$to_bin_disk <- function(path) .Call(wrap__DirectedGraph__to_bin_disk, self, path)
@@ -84,10 +84,10 @@ DirectedAcyclicGraph$get_all_roots <- function() .Call(wrap__DirectedAcyclicGrap
 
 DirectedAcyclicGraph$get_roots_over <- function(node_ids) .Call(wrap__DirectedAcyclicGraph__get_roots_over, self, node_ids)
 
-DirectedAcyclicGraph$subset <- function(node_id) .Call(wrap__DirectedAcyclicGraph__subset, self, node_id)
-
 DirectedAcyclicGraph$subset_multi <- function(node_ids) .Call(wrap__DirectedAcyclicGraph__subset_multi, self, node_ids)
 
+DirectedAcyclicGraph$subset_multi_with_limit <- function(node_ids, limit) .Call(wrap__DirectedAcyclicGraph__subset_multi_with_limit, self, node_ids, limit)
+
 DirectedAcyclicGraph$print <- function() invisible(.Call(wrap__DirectedAcyclicGraph__print, self))
 
 DirectedAcyclicGraph$to_bin_disk <- function(path) .Call(wrap__DirectedAcyclicGraph__to_bin_disk, self, path)

R/subset.R

@@ -1,17 +1,19 @@
+NO_LIMIT <- -1L
+
 #' @export
-subset.DirectedGraph <- function(x, ...) {
+subset.DirectedGraph <- function(x, ..., limit = NO_LIMIT) {
   arguments <- c(...)
-  if (length(arguments) > 1) {
+  if (limit == NO_LIMIT) {
     return(throw_if_error(x$subset_multi(arguments)))
   }
-  throw_if_error(x$subset(arguments))
+  return(throw_if_error(x$subset_multi_with_limit(arguments, limit)))
 }
 
 #' @export
-subset.DirectedAcyclicGraph <- function(x, ...) {
+subset.DirectedAcyclicGraph <- function(x, ..., limit = NO_LIMIT) {
   arguments <- c(...)
-  if (length(arguments) > 1) {
+  if (limit == NO_LIMIT) {
     return(throw_if_error(x$subset_multi(arguments)))
   }
-  throw_if_error(x$subset(arguments))
+  return(throw_if_error(x$subset_multi_with_limit(arguments, limit)))
 }

src/rust/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = 'orbweaver_r'
-version = '0.16.0'
+version = '0.18.0'
 edition = '2021'
 
 [lib]
 crate-type = [ 'staticlib', 'lib' ]
 name = 'orbweaver_r'
 
 [dependencies]
-orbweaver = { version = "0.17.1" }
+orbweaver = { version = "0.18.0" }
 extendr-api = { version = "0.7", features = ["serde", "result_condition"] }
 
 # This will help us filter the platforms

src/rust/src/lib.rs

@@ -144,8 +144,8 @@ pub trait RImplDirectedGraph: Sized {
     fn get_leaves_under(&self, nodes: RNodesIn) -> Result<NodeVec>;
     fn get_all_roots(&self) -> NodeVec;
     fn get_roots_over(&self, node_ids: RNodesIn) -> Result<NodeVec>;
-    fn subset(&self, node_id: &str) -> Result<Self>;
     fn subset_multi(&self, node_id: RNodesIn) -> Result<Self>;
+    fn subset_multi_with_limit(&self, node_id: RNodesIn, limit: i32) -> Result<Self>;
     fn print(&self);
     fn find_all_paths(&self, from: &str, to: &str) -> Result<List>;
     fn to_bin_disk(&self, path: &str) -> Result<()>;

src/rust/src/macros.rs

@@ -48,14 +48,25 @@ macro_rules! impl_directed_graph {
                     .map_err(to_r_error)
                     .map(NodeVec)
             }
-            fn subset(&self, node_id: &str) -> Result<Self> {
-                Ok(Self(self.0.subset(node_id).map_err(to_r_error)?))
-            }
             fn subset_multi(&self, node_ids: RNodesIn) -> Result<Self> {
                 Ok(Self(
                     self.0.subset_multi(node_ids.iter()).map_err(to_r_error)?,
                 ))
             }
+            fn subset_multi_with_limit(&self, node_ids: RNodesIn, limit: i32) -> Result<Self> {
+                if limit <= 0 {
+                    return Err("Limit cannot be negative".into());
+                }
+
+                // This is safe because we checked right before
+                let limit = unsafe { std::num::NonZeroUsize::new_unchecked(limit as usize) };
+
+                Ok(Self(
+                    self.0
+                        .subset_multi_with_limit(node_ids.iter(), limit)
+                        .map_err(to_r_error)?,
+                ))
+            }
             fn print(&self) {
                 println!("{:?}", self.0)
             }