bugfixes

xoopR · May 18, 2020 · 0a3b1e5 · 0a3b1e5
1 parent 7452ccc
commit 0a3b1e5
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 13 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: set6
 Title: R6 Mathematical Sets Interface
-Version: 0.1.3.9000
+Version: 0.1.4
 Authors@R: 
       c(person(given = "Raphael",
              family = "Sonabend",

diff --git a/NAMESPACE b/NAMESPACE
@@ -40,17 +40,17 @@ S3method(as.Set,FuzzySet)
 S3method(as.Set,Interval)
 S3method(as.Set,Set)
 S3method(as.Set,data.frame)
+S3method(as.Set,default)
 S3method(as.Set,list)
 S3method(as.Set,matrix)
-S3method(as.Set,numeric)
 S3method(as.Tuple,ConditionalSet)
 S3method(as.Tuple,FuzzySet)
 S3method(as.Tuple,Interval)
 S3method(as.Tuple,Set)
 S3method(as.Tuple,data.frame)
+S3method(as.Tuple,default)
 S3method(as.Tuple,list)
 S3method(as.Tuple,matrix)
-S3method(as.Tuple,numeric)
 S3method(as.character,Set)
 S3method(as.double,Set)
 S3method(setcomplement,ComplementSet)

diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,9 @@
-# set6 0.1.3.9000
+# set6 0.1.4
 
 * Speed performance improvements for `$contains` method for `Interval` and `Set`. `Rcpp` now used for `Interval`.
 * Now for any `Interval` if not bounded above and `upper` is $Inf$ then `max = .Machine$double.xmax`, analogously for `lower`.
 * Default universe of `Interval` is now `ExtendedReals`
+* Added default `as.Set` and `as.Interval` S3 methods
 
 # set6 0.1.3
 

diff --git a/R/Set_Interval.R b/R/Set_Interval.R
@@ -182,6 +182,7 @@ Interval <- R6Class("Interval", inherit = Set,
     #' c(Tuple$new(2,1), Tuple$new(1,7), 2) %inset% s2
     contains = function(x, all = FALSE, bound = FALSE){
       x = suppressWarnings(as(unlist(x), "numeric"))
+      x[is.na(x)] = NaN
       if (is.null(x)) {
         return(TRUE)
       } else {

diff --git a/R/asSet.R b/R/asSet.R
@@ -2,6 +2,7 @@
 #' @templateVar class1 Set
 #' @templateVar class2 Tuple
 #' @details
+#' * `as.Set.default` - Creates a [Set] using the object as the elements.
 #' * `as.Set.list` - Creates a [Set] for each element in `list`.
 #' * `as.Set.matrix/as.Set.data.frame` - Creates a [Set] for each column in `matrix/data.frame`.
 #' * `as.Set.FuzzySet` - Creates a [Set] from the support of the [FuzzySet].
@@ -12,7 +13,7 @@ as.Set <- function(object){
 }
 #' @rdname as.Set
 #' @export
-as.Set.numeric <- function(object){
+as.Set.default <- function(object){
   Set$new(elements = object)
 }
 #' @rdname as.Set
@@ -63,7 +64,7 @@ as.Tuple <- function(object){
 }
 #' @rdname as.Set
 #' @export
-as.Tuple.numeric <- function(object){
+as.Tuple.default <- function(object){
   Tuple$new(elements = object)
 }
 #' @rdname as.Set

diff --git a/R/operation_cleaner.R b/R/operation_cleaner.R
@@ -22,7 +22,7 @@ operation_cleaner <- function(sets, operation_class, nest, simplify = TRUE){
       # try converting all intervals to sets
       if(any(sapply(sets[interval], function(x) x$properties$countability == "uncountable"))) {
         sets[set] = lapply(sets[set], function(el){
-          return(ifnerror(as.Interval(el), error = el))
+          suppressWarnings(return(ifnerror(as.Interval(el), error = el)))
         })
         return(sets)
       }

diff --git a/man/Interval.Rd b/man/Interval.Rd
diff --git a/man/as.Set.Rd b/man/as.Set.Rd
diff --git a/man/set6-package.Rd b/man/set6-package.Rd
diff --git a/set6.Rproj b/set6.Rproj
@@ -18,3 +18,4 @@ StripTrailingWhitespace: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
+PackageRoxygenize: rd,collate,namespace