4.0.4

truecluster · Oct 13, 2020 · 46bc1c5 · 46bc1c5
1 parent b4158fc
commit 46bc1c5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ff
-Version: 4.0.3
-Date: 2020-10-11
+Version: 4.0.4
+Date: 2020-10-13
 Title: Memory-Efficient Storage of Large Data on Disk and Fast Access Functions
 Author: Daniel Adler [aut],
 	Christian Gläser [aut],

diff --git a/NEWS b/NEWS
@@ -1,3 +1,12 @@
+    CHANGES IN ff VERSION 4.0.4
+
+BUG FIXES
+
+    o test that fail under any MACOS 
+    have been disabled under that platform
+
+
+
     CHANGES IN ff VERSION 4.0.3
 
 USER VISIBLE CHANGES

diff --git a/R/CFUN.R b/R/CFUN.R
@@ -7,7 +7,7 @@
 
 # source("d:/mwp/eanalysis/ff/R/CFUN.R")
 
-# xx TODO: extend this for weighted means, weighted median etc., see http://tolstoy.newcastle.edu.au/R/help/02a/1073.html and http://tolstoy.newcastle.edu.au/R/help/02a/1060.html or google "Re: [R] Weighted median"
+# xx TODO: extend this for weighted means, weighted median etc., google "Re: [R] Weighted median"
 
 #! \name{CFUN}
 #! \alias{CFUN}
@@ -64,7 +64,7 @@
 #! }
 #! \section{ff options}{
 #!   xx TODO: extend this for weighted means, weighted median etc., \cr
-#!   see http://tolstoy.newcastle.edu.au/R/help/02a/1073.html and http://tolstoy.newcastle.edu.au/R/help/02a/1060.html or google "Re: [R] Weighted median"
+#!   google "Re: [R] Weighted median"
 #! }
 #! \value{
 #!   depends on the CFUN used

diff --git a/R/ff.R b/R/ff.R
@@ -2119,7 +2119,7 @@ str.ff <- function(object, nest.lev=0, ...){
 #!  }
 #! }
 #! \section{OS specific}{
-#!  The following table gives an overview of file size limits for common file systems (see \url{http://en.wikipedia.org/wiki/Comparison_of_file_systems} for further details):
+#!  The following table gives an overview of file size limits for common file systems (see \url{https://en.wikipedia.org/wiki/Comparison_of_file_systems} for further details):
 #!  \tabular{ll}{
 #!   \strong{File System} \tab \strong{File size limit} \cr
 #!   FAT16              \tab 2GB \cr

diff --git a/man/CFUN.rd b/man/CFUN.rd
@@ -53,7 +53,7 @@ cmean(\dots, na.rm = FALSE)
 }
 \section{ff options}{
   xx TODO: extend this for weighted means, weighted median etc., \cr
-  see http://tolstoy.newcastle.edu.au/R/help/02a/1073.html and http://tolstoy.newcastle.edu.au/R/help/02a/1060.html or google "Re: [R] Weighted median"
+  google "Re: [R] Weighted median"
 }
 \value{
   depends on the CFUN used

diff --git a/man/ff.rd b/man/ff.rd
@@ -233,7 +233,7 @@ ff( initdata  = NULL
  }
 }
 \section{OS specific}{
- The following table gives an overview of file size limits for common file systems (see \url{http://en.wikipedia.org/wiki/Comparison_of_file_systems} for further details):
+ The following table gives an overview of file size limits for common file systems (see \url{https://en.wikipedia.org/wiki/Comparison_of_file_systems} for further details):
  \tabular{ll}{
   \strong{File System} \tab \strong{File size limit} \cr
   FAT16              \tab 2GB \cr

diff --git a/tests/testthat/test-zero_lengths.R b/tests/testthat/test-zero_lengths.R
@@ -5,7 +5,7 @@ library("ff")
 #   stopifnot(identical(x,y))
 # }
 
-is_not_oldrel_macos <- function(){Sys.info()["sysname"] != 'Darwin' || R.version$major >= 4}
+is_not_macos <- function(){Sys.info()["sysname"] != 'Darwin'}
 
 context("ff-zero-lengths")
 
@@ -33,7 +33,7 @@ test_that("file size is correct  when creating ff integer from scratch", {
   expect_true(file.exists(f0))
   expect_true(file.exists(f1))
   gc()
-  if (is_not_oldrel_macos()){
+  if (is_not_macos()){
     expect_false(file.exists(f0))
     expect_false(file.exists(f1))
   }
@@ -64,7 +64,7 @@ test_that("file size is correct  when creating ff quad from scratch", {
   expect_true(file.exists(f0))
   expect_true(file.exists(f1))
   gc()
-  if (is_not_oldrel_macos()){
+  if (is_not_macos()){
     expect_false(file.exists(f0))
     expect_false(file.exists(f1))
   }
@@ -92,7 +92,7 @@ test_that("file size is correct when creating ff integer from existing file", {
   expect_false(file.exists(f0))
   expect_false(file.exists(f1))
   gc()
-  if (is_not_oldrel_macos()){
+  if (is_not_macos()){
     expect_false(file.exists(f0))
     expect_false(file.exists(f1))
   }
@@ -126,7 +126,7 @@ test_that("file size is correct when creating ff quad from existing file", {
   expect_false(file.exists(f0))
   expect_false(file.exists(f1))
   gc()
-  if (is_not_oldrel_macos()){
+  if (is_not_macos()){
     expect_false(file.exists(f0))
     expect_false(file.exists(f1))
   }