Moved to RObjects instead of SEXPs <3

dirmeier · Aug 16, 2018 · 0f25583 · 0f25583
1 parent d4aa988
commit 0f25583
Show file tree

Hide file tree

Showing 19 changed files with 215 additions and 123 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -36,6 +36,7 @@ NeedsCompilation: yes
 Collate: 
     'checks.R'
     'datastructures-package.R'
+    'methods_clear.R'
     'methods_insert.R'
     'methods_size.R'
     'methods_pop.R'
@@ -49,7 +50,6 @@ Collate:
     'ds_heap.R'
     'ds_heap_binomial.R'
     'ds_heap_fibonacci.R'
-    'methods_clear.R'
     'methods_remove.R'
     'methods_head.R'
     'ds_map.R'

diff --git a/R/ds_deque.R b/R/ds_deque.R
@@ -22,6 +22,7 @@
 #' @include methods_pop.R
 #' @include methods_size.R
 #' @include methods_insert.R
+#' @include methods_clear.R
 NULL
 
 
@@ -42,6 +43,12 @@ setClass(
 )
 
 
+.clear.deque <- function(obj)
+{
+    obj@.deque$clear()
+    obj
+}
+
 #' @noRd
 .peek.deque <- function(obj)
 {
@@ -67,7 +74,6 @@ setClass(
 {
     cat(paste0("An object of class ", class(object)[1], "<SEXP>\n\n"))
     li <- peek(object)
-    if (is.null(li))  li <- "NULL"
     cat(paste0("Peek: ", class(li), ", ...\n"))
 }
 
@@ -83,7 +89,6 @@ setClass(
 .insert.deque <- function(obj, x)
 {
     obj@.deque$insert(x)
-
     obj
 }
 
@@ -110,6 +115,7 @@ setMethod(
   function(obj, x) .insert.deque(obj, list(x))
 )
 
+
 #' @rdname insert-methods
 setMethod(
   "insert",
@@ -120,3 +126,7 @@ setMethod(
       .insert.deque(obj, x)
   }
 )
+
+
+#' @rdname clear-methods
+setMethod("clear", "deque", .clear.deque)
diff --git a/R/ds_heap.R b/R/ds_heap.R
@@ -25,6 +25,7 @@
 #' @include methods_handle.R
 #' @include methods_decrease.R
 #' @include methods_values.R
+#' @include methods_clear.R
 NULL
 
 
@@ -99,6 +100,14 @@ setClass(
 }
 
 
+#' @noRd
+.clear.heap <- function(obj)
+{
+    obj@.heap$clear()
+    obj
+}
+
+
 #' @noRd
 #' @importFrom purrr map
 .handle <- function(obj, key, value)
@@ -169,6 +178,7 @@ setMethod(
     }
 )
 
+
 #' @rdname insert-methods
 setMethod(
     "insert",
@@ -182,7 +192,6 @@ setMethod(
 )
 
 
-
 #' @rdname insert-methods
 setMethod(
   "insert",
@@ -328,6 +337,7 @@ setMethod("peek", "heap", .peek.heap)
 #' @rdname pop-methods
 setMethod("pop", "heap", .pop.heap)
 
+
 #' @noRd
 setMethod("show", "heap", .show.heap)
 
@@ -338,3 +348,7 @@ setMethod("size", "heap", .size.heap)
 
 #' @rdname values-methods
 setMethod("values", "heap", .heap_values)
+
+
+#' @rdname clear-methods
+setMethod("clear", "heap", .clear.heap)
diff --git a/R/ds_map.R b/R/ds_map.R
@@ -103,9 +103,10 @@ setMethod(
 )
 
 
-#' @rdname size-methods
+#' @rdname clear-methods
 setMethod("clear", "map", .clear.map)
 
+
 #' @noRd
 setMethod("show", "map", .show.map)
 

diff --git a/docs/articles/datastructures.html b/docs/articles/datastructures.html
diff --git a/docs/reference/clear-methods.html b/docs/reference/clear-methods.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/size-methods.html b/docs/reference/size-methods.html