From a2de5bd5f149272bbdf1691c2e0501c3e8b4b544 Mon Sep 17 00:00:00 2001
From: Emil Hvitfeldt <emilhhvitfeldt@gmail.com>
Date: Wed, 1 May 2024 08:02:20 -0700
Subject: [PATCH] use altrep in vctrs class

---
 NAMESPACE            |  3 --
 R/vector.R           | 89 ++++++++++++++++++++------------------------
 man/sparse_vector.Rd |  2 +-
 3 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index a8ed218..8f6b75f 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,9 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(format,sparse_vector)
-S3method(vec_arith,sparse_vector)
-S3method(vec_math,sparse_vector)
-S3method(vec_ptype_abbr,sparse_vector)
 export(new_sparse_real)
 export(new_sparse_vector)
 export(sparse_to_tibble)
diff --git a/R/vector.R b/R/vector.R
index 2b37a0d..1a2c9eb 100644
--- a/R/vector.R
+++ b/R/vector.R
@@ -11,13 +11,8 @@
 #' @examples
 #' new_sparse_vector(1, 4, 10)
 new_sparse_vector <- function(values, positions, length) {
-  vec_assert(values, double())
-  vec_assert(values, double())
-  vec_assert(values, double())
-  res <- seq(length)
+  res <- new_sparse_real(values, positions, length)
   res <- new_vctr(res, class = "sparse_vector")
-  attr(res, "values") <- values
-  attr(res, "positions") <- positions
   res
 }
 
@@ -34,58 +29,56 @@ new_sparse_vector <- function(values, positions, length) {
 #' @examples
 #' sparse_vector(1, 4, 10)
 sparse_vector <- function(values = double(),
-                          positions = double(),
-                          length = double()) {
+                          positions = integer(),
+                          length = integer()) {
   new_sparse_vector(values, positions, length)
 }
 
 #' @export
 format.sparse_vector <- function(x, ...) {
-  out <- rep(0, length(x))
-  out[attr(x, "positions")] <- attr(x, "values")
-  out
+  vec_data(x)
 }
 
-#' @export
-vec_ptype_abbr.sparse_vector <- function(x, ...) {
-  "spvtr"
-}
+#'  @export
+# vec_ptype_abbr.sparse_vector <- function(x, ...) {
+#  "spvtr"
+# }
 
 #' @export
-vec_math.sparse_vector <- function(.fn, .x, ...) {
-  switch(
-    .fn,
-    sum = sum(attr(.x, "values")),
-    prod = ifelse(length(attr(.x, "values")) != length(.x), 0, prod(attr(.x, "values"))),
-    mean = sum(attr(.x, "values")) / length(.x),
-    vec_math_base(.fn, .x, ...)
-  )
-}
-
-sparse_vector_addition <- function(x, y) {
-  res <- y
-
-  values <- attr(x, "values")
-  positions <- attr(x, "positions")
-
-  overlap <- positions %in% attr(res, "positions")
+# vec_math.sparse_vector <- function(.fn, .x, ...) {
+#  switch(
+#    .fn,
+#    sum = sum(attr(.x, "values")),
+#    prod = ifelse(length(attr(.x, "values")) != length(.x), 0, prod(attr(.x, "values"))),
+#    mean = sum(attr(.x, "values")) / length(.x),
+# vec_math_base(.fn, .x, ...)
+#  )
+#}
 
-  res_loc <- match(positions[overlap], attr(res, "positions"))
-
-  attr(res, "values")[res_loc] <- attr(res, "values")[res_loc] + values[overlap]
-
-  attr(res, "values") <- c(attr(res, "values"), values[!overlap])
-
-  attr(res, "positions") <- c(attr(res, "positions"), positions[!overlap])
-  res
-}
+#sparse_vector_addition <- function(x, y) {
+#  res <- y
+#
+#  values <- attr(x, "values")
+#  positions <- attr(x, "positions")
+#
+#  overlap <- positions %in% attr(res, "positions")
+#
+#  res_loc <- match(positions[overlap], attr(res, "positions"))
+#
+#  attr(res, "values")[res_loc] <- attr(res, "values")[res_loc] + values[overlap]
+#
+#  attr(res, "values") <- c(attr(res, "values"), values[!overlap])
+#
+#  attr(res, "positions") <- c(attr(res, "positions"), positions[!overlap])
+#  res
+#}
 
 #' @export
 #' @method vec_arith sparse_vector
-vec_arith.sparse_vector <- function(op, x, y, ...) {
-  switch(
-    op,
-    "+" = sparse_vector_addition(x, y),
-    stop_incompatible_op(op, x, y)
-  )
-}
+#vec_arith.sparse_vector <- function(op, x, y, ...) {
+#  switch(
+#    op,
+#    "+" = sparse_vector_addition(x, y),
+#    stop_incompatible_op(op, x, y)
+#  )
+#}
diff --git a/man/sparse_vector.Rd b/man/sparse_vector.Rd
index 866f861..fdbe0ee 100644
--- a/man/sparse_vector.Rd
+++ b/man/sparse_vector.Rd
@@ -4,7 +4,7 @@
 \alias{sparse_vector}
 \title{Create new sparse vector}
 \usage{
-sparse_vector(values = double(), positions = double(), length = double())
+sparse_vector(values = double(), positions = integer(), length = integer())
 }
 \arguments{
 \item{values}{Vector of values}