Update to fix CRAN checks on windows-devel.

fbertran · Apr 10, 2021 · f6ad7f2 · f6ad7f2
1 parent e63bd1c
commit f6ad7f2
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 78 deletions.
diff --git a/MD5 b/MD5
diff --git a/cleanup b/cleanup
@@ -1,3 +1,7 @@
+#!/bin/sh
+
+## a.out.dSYM may get created on OS X.
+## rm -rf src/Makevars 
 rm -f src/*.o src/*.so
 rm -f src/refblas64/*.o src/refblas64/*.so src/refblas64/*.a
 rm -rf autom4te.cache
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,5 +2,5 @@ pandoc: 2.11.2
 pkgdown: 1.6.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-04-10T01:07Z
+last_built: 2021-04-10T13:56Z
 
diff --git a/docs/reference/Ops.html b/docs/reference/Ops.html
diff --git a/docs/reference/bigalgebra-package.html b/docs/reference/bigalgebra-package.html
diff --git a/docs/reference/daxpy.html b/docs/reference/daxpy.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/man/bigalgebra-package.Rd b/man/bigalgebra-package.Rd
@@ -78,8 +78,10 @@ Maintainer: Frédéric Bertrand <frederic.bertrand@utt.fr>
 # if you have any problems, please email us!  - Jay & Mike 4/29/2010
 
 library("bigmemory")
-A <- big.matrix(5,4,init=1)
-B <- big.matrix(4,4,init=2)
+A <- big.matrix(5,4, type="double", init=0,
+                dimnames=list(NULL, c("alpha", "beta")))
+B <- big.matrix(4,4, type="double", init=0,
+                dimnames=list(NULL, c("alpha", "beta")))
 
 C <- A %*% B       # Returns a new big.matrix object
 D <- A[] %*% B[]   # Compute the same thing in R

diff --git a/man/daxpy.Rd b/man/daxpy.Rd
@@ -59,7 +59,8 @@ Michael J. Kane
 \examples{
 require(bigmemory)
 A = matrix(1, nrow=3, ncol=2)
-B = big.matrix(nrow=3, ncol=2, type='double', init=1)
+B <- big.matrix(3, 2, type="double", init=0,
+                dimnames=list(NULL, c("alpha", "beta")), shared=FALSE)
 C = B + B   # C is a new big matrix
 D = A + B   # D defaults to a regular R matrix, to change this, set the option:
             # optons(bigalgebra.mixed_arithmetic_returns_R_matrix=FALSE)

diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1,3 @@
 PKG_CPPFLAGS=-I../include
+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
diff --git a/src/Makevars.win b/src/Makevars.win
diff --git a/src/R_init_bigalgebra.c b/src/R_init_bigalgebra.c
@@ -1,6 +1,5 @@
 //
-// 2019-02-19. Author F. Bertrand <fbertran@math.unistra.fr>
-// Copyright (c) Universite de Strasbourg and CNRS
+// 2021-04-10. Author F. Bertrand <frederic.bertrand@utt.fr>
 //
 
 #include <stdlib.h> // for NULL