using savvy

daniellga · Apr 6, 2024 · 6ef04ea · 6ef04ea
1 parent 25f0c43
commit 6ef04ea
Show file tree

Hide file tree

Showing 21 changed files with 840 additions and 682 deletions.
diff --git a/r-harmonium/.testtest.R b/r-harmonium/.testtest.R
@@ -1,4 +1,3 @@
-rextendr::register_extendr()
 devtools::load_all(".", export_all = FALSE)
 devtools::test()
 devtools::check(document = FALSE, cran = FALSE, args = c("--no-manual", "--no-build-vignettes", "--no-codoc", "--no-examples", "--no-tests"))

diff --git a/r-harmonium/NAMESPACE b/r-harmonium/NAMESPACE
@@ -4,17 +4,17 @@ importFrom("utils", "browseURL")
 export(HArray)
 export(HDataType)
 export(HAudioSink)
-#export(HResampler)
+export(HResampler)
 export(HResamplerType)
 export(HSincInterpolationParameters)
 export(HPolynomialDegree)
 export(HWindow)
 export(HMetadataType)
-#export(HFile)
+export(HFile)
 export(HFft)
 export(HAudioOp)
 export(hdocs)
-#export(HDecoderStream)
+export(HDecoderStream)
 
 S3method("==",HArray)
 S3method("==",HDataType)
@@ -29,34 +29,8 @@ S3method("!=",HPolynomialDegree)
 S3method(print,HArray)
 S3method(print,HDataType)
 S3method(print,HMetadataType)
-#S3method(print,HResampler)
+S3method(print,HResampler)
 S3method(print,HResamplerType)
 S3method(print,HPolynomialDegree)
-#S3method("$",HArray)
-#S3method("$",HAudioSink)
-#S3method("$",HDataType)
-##S3method("$",HFile)
-#S3method("$",HSincInterpolationParameters)
-#S3method("$",HMetadataType)
-##S3method("$",HResampler)
-#S3method("$",HResamplerType)
-#S3method("$",HWindow)
-#S3method("$",HPolynomialDegree)
-#S3method("$",HFft)
-#S3method("$",HAudioOp)
-##S3method("$",HDecoderStream)
-#S3method("[[",HArray)
-#S3method("[[",HAudioSink)
-#S3method("[[",HDataType)
-##S3method("[[",HFile)
-#S3method("[[",HSincInterpolationParameters)
-#S3method("[[",HMetadataType)
-##S3method("[[",HResampler)
-#S3method("[[",HResamplerType)
-#S3method("[[",HWindow)
-#S3method("[[",HPolynomialDegree)
-#S3method("[[",HFft)
-#S3method("[[",HAudioOp)
-##S3method("[[",HDecoderStream)
 
 useDynLib(harmonium, .registration = TRUE)
diff --git a/r-harmonium/R/structs.R b/r-harmonium/R/structs.R
@@ -1,17 +1,17 @@
-# print.HArray = function(x, ...) {
-#   cat(class(x), sep = "\n")
-#   x$dtype()$print()
-#   x$print()
-# }
-# "==.HArray" <- function(e1,e2) e1$eq(e2)
-# "!=.HArray" <- function(e1,e2) e1$ne(e2)
-# 
-# print.HDataType = function(x, ...) {
-#  x$print()
-# }
-# "==.HDataType" <- function(e1,e2) e1$eq(e2)
-# "!=.HDataType" <- function(e1,e2) e1$ne(e2)
-# 
+print.HArray = function(x, ...) {
+  cat(class(x), sep = "\n")
+  x$dtype()$print()
+  x$print()
+}
+"==.HArray" <- function(e1,e2) e1$eq(e2)
+"!=.HArray" <- function(e1,e2) e1$ne(e2)
+
+print.HDataType = function(x, ...) {
+    x$print()
+}
+"==.HDataType" <- function(e1,e2) e1$eq(e2)
+"!=.HDataType" <- function(e1,e2) e1$ne(e2)
+
 # print.HMetadataType = function(x, ...) {
 #   x$print()
 # }