Merge pull request #2 from wrathematics/master

get updates

Author: snoweye

Diff for: .Rbuildignore

@@ -1,4 +1,6 @@
 ^\.travis\.yml$
+^appveyor.yml$
+
 .vscode
 
 LICENSE.md

Diff for: .gitignore

@@ -1,11 +1,22 @@
 *~
 *.swp
+*.status
 
 src/*.o
 src/*.so
+src/*.a
+
+src/utils/*.o
+src/utils/*.so
+src/utils/*.a
+
 src/Makevars
 src/endianness.h
 
 inst/doc
+inst/lib
+
+config.log
 
 TODO
+.Rproj.user

Diff for: ChangeLog

@@ -1,2 +1,43 @@
+Release 0.1-2:
+  * Fixed protect stack imbalance in R_init_NA().
+  * Hid 'restrict' keyword from C++ in inst/include headers.
+  * Fixed control logic in various [ calls.
+  * Created float:::ldflags() for dynamic linking.
+  * Added some skeleton support for names+row/col-names.
+  * Fixed performance bug with [.
+  * Fixed NA overflow bug with length() for large matrices.
+  * Fixed str() printing bug for matrices.
+
+Release 0.1-1:
+  * Added str() method.
+  * Added replacer [ method.
+  * Remove \dontrun{} blocks from manual.
+
 Release 0.1-0:
-  * 
+  * Added fl() and dbl() casters.
+  * Added random constructors flrunif(), flrnorm(), and flrand().
+  * Added backsolve() and forwardsolve() methods.
+  * Added binary arithmetic methods.
+  * Added rbind() and cbind() methods.
+  * Added [ method.
+  * Added c() method.
+  * Added chol() and chol2inv() methods.
+  * Added colSums(), rowSums(), colMeans(), and rowMeans() methods.
+  * Added rcond() method.
+  * Added crossprod() and tcrossprod() methods.
+  * Added diag() method.
+  * Added eigen() method (symmetric case only).
+  * Added min(), max(), which.min(), and which.max() methods.
+  * Added isSymmetric() method.
+  * Added math methods.
+  * Added %*% method.
+  * Added is.na() and na.omit() methods.
+  * Added norm() method.
+  * Added qr(), qr.Q(), qr.R(), qr.qy(), and qr.qty() methods.
+  * Added scale() method.
+  * Added solve() method.
+  * Added sum() method.
+  * Added svd() and La.svd() methods.
+  * Added sweep() method (+, -, *, and / only).
+  * Added t() method.
+  * Added float32() constructor for developers.

Diff for: DESCRIPTION

@@ -1,31 +1,34 @@
 Package: float
 Type: Package
-Title: Single Precision Floats
-Version: 0.1-0
+Title: 32-Bit Floats
+Version: 0.1-2
 Description: R comes with a suite of utilities for linear algebra with "numeric"
-    (integer/double precision) vectors/matrices. However, sometimes single
-    precision (or less!) is more than enough for a particular task.  This
-    package extends R's linear algebra facilities to include single precision
-    (float) data.  Float vectors/matrices have half the precision of their
-    "numeric"-type counterparts, for a performance vs accuracy trade-off.  The
-    internal representation is an S4 class, which allows us to keep the syntax
-    identical to that of base R's.  Interaction between floats and base types
-    for binary operators is generally possible; in these cases, type promotion
-    always defaults to the higher precision.  The package ships with copies of
-    the single precision 'BLAS' and 'LAPACK', which are automatically built in
-    the event they are not available on the system.
+    (double precision) vectors/matrices. However, sometimes single precision (or
+    less!) is more than enough for a particular task.  This package extends R's
+    linear algebra facilities to include 32-bit float (single precision) data.
+    Float vectors/matrices have half the precision of their "numeric"-type
+    counterparts but are generally faster to numerically operate on, for a
+    performance vs accuracy trade-off.  The internal representation is an S4
+    class, which allows us to keep the syntax identical to that of base R's.
+    Interaction between floats and base types for binary operators is generally
+    possible; in these cases, type promotion always defaults to the higher
+    precision.  The package ships with copies of the single precision 'BLAS' and
+    'LAPACK', which are automatically built in the event they are not available
+    on the system.
 License: BSD 2-clause License + file LICENSE
 Copyright: The copyright for the single precision BLAS/LAPACK distribution
     located in src/lapack is given in the file src/lapack/LICENSE.
 Depends:
-    R (>= 3.1.0), methods
+    R (>= 3.1.0),
+    methods
 Imports:
     utils
 ByteCompile: yes
 URL: https://github.com/wrathematics/float
 BugReports: https://github.com/wrathematics/float/issues
 Authors@R: c(
     person("Drew", "Schmidt", role=c("aut", "cre", "cph"), email="[email protected]"),
+    person("Wei-Chen", "Chen", role="ctb", comment="win32 fixes"),
     person("ORNL", role="cph")
     )
 Maintainer: Drew Schmidt <[email protected]>

Diff for: LICENSE

@@ -1,2 +1,5 @@
-YEAR: 2015-2017
-COPYRIGHT HOLDER: Drew Schmidt, ORNL
+YEAR: 2017
+COPYRIGHT HOLDER: Oak Ridge National Laboratory
+
+YEAR: 2014-2017
+COPYRIGHT HOLDER: Drew Schmidt

Diff for: LICENSE.md

@@ -1,4 +1,5 @@
-Copyright 2014-2017 Drew Schmidt, ORNL
+Copyright 2017 ORNL
+Copyright 2014-2017 Drew Schmidt
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

Diff for: NAMESPACE

@@ -4,6 +4,7 @@ S3method(as.matrix,float32)
 S3method(as.vector,float32)
 S3method(cbind,float32)
 S3method(rbind,float32)
+S3method(str,float32)
 export(.Machine_float)
 export(dbl)
 export(fl)
@@ -25,8 +26,13 @@ exportMethods("==")
 exportMethods(">")
 exportMethods(">=")
 exportMethods("[")
+exportMethods("[<-")
 exportMethods("^")
+exportMethods("colnames<-")
 exportMethods("dim<-")
+exportMethods("dimnames<-")
+exportMethods("names<-")
+exportMethods("rownames<-")
 exportMethods(La.svd)
 exportMethods(NCOL)
 exportMethods(NROW)
@@ -44,11 +50,13 @@ exportMethods(chol)
 exportMethods(chol2inv)
 exportMethods(colMeans)
 exportMethods(colSums)
+exportMethods(colnames)
 exportMethods(cos)
 exportMethods(cosh)
 exportMethods(crossprod)
 exportMethods(diag)
 exportMethods(dim)
+exportMethods(dimnames)
 exportMethods(eigen)
 exportMethods(exp)
 exportMethods(expm1)
@@ -69,6 +77,7 @@ exportMethods(max)
 exportMethods(min)
 exportMethods(na.exclude)
 exportMethods(na.omit)
+exportMethods(names)
 exportMethods(ncol)
 exportMethods(norm)
 exportMethods(nrow)
@@ -82,6 +91,7 @@ exportMethods(rcond)
 exportMethods(round)
 exportMethods(rowMeans)
 exportMethods(rowSums)
+exportMethods(rownames)
 exportMethods(scale)
 exportMethods(show)
 exportMethods(sin)
@@ -102,6 +112,7 @@ exportMethods(which.max)
 exportMethods(which.min)
 import(methods)
 importFrom(utils,capture.output)
+importFrom(utils,str)
 useDynLib(float,R_abs_spm)
 useDynLib(float,R_acos_spm)
 useDynLib(float,R_acosh_spm)
@@ -132,7 +143,8 @@ useDynLib(float,R_flrunif_spm)
 useDynLib(float,R_gamma_spm)
 useDynLib(float,R_ge_spm)
 useDynLib(float,R_gt_spm)
-useDynLib(float,R_init_NA)
+useDynLib(float,R_init_NAf)
+useDynLib(float,R_init_NaNf)
 useDynLib(float,R_isSymmetric_spm)
 useDynLib(float,R_isfinite_spm)
 useDynLib(float,R_isinfinite_spm)

Diff for: R/00-classes.r

@@ -2,7 +2,7 @@ setClassUnion("Int", c("integer", "matrix"))
 
 #' Class float32
 #' 
-#' An S4 container for single precision (float) vector/matrix objects.
+#' An S4 container for 32-bit float vector/matrix objects.
 #' 
 #' @slot Data
 #' A vector or matrix of integers.
@@ -19,4 +19,3 @@ setClass("float32",
 
 setClassUnion("Mat", c("matrix", "float32"))
 setClassUnion("BaseLinAlg", c("matrix", "vector"))
-

Diff for: R/02-flags.r

@@ -0,0 +1,14 @@
+ldflags = function()
+{
+  if (.Platform$OS.type != "windows")
+  {
+    flags = tools::file_path_as_absolute(system.file("libs", package = "float"))
+  }
+  else
+  {
+    path = file.path("libs", .Platform$r_arch)
+    flags = tools::file_path_as_absolute(system.file(path, package = "float"))
+  }
+  
+  cat(paste0("-L", flags,  " -lfoat"))
+}

Diff for: R/backsolve.r

@@ -14,6 +14,14 @@
 #' Should the transposed coefficients matrix be used? More efficient than
 #' manually transposing with \code{t()}.
 #' 
+#' @examples
+#' library(float)
+#' 
+#' s = flrunif(10, 3)
+#' cp = crossprod(s)
+#' y = fl(1:3)
+#' backsolve(cp, y)
+#' 
 #' @name backsolve
 #' @rdname backsolve
 NULL

Diff for: R/binary.r

@@ -47,21 +47,19 @@ binop = function(e1, e2, fun, floatfun)
 #' A matrix of the same type as the highest precision input.
 #' 
 #' @examples
-#' \dontrun{
 #' library(float)
 #' 
 #' s1 = flrunif(5, 5)
-#' s2 = flrunif(5, 2)
+#' s2 = flrunif(5, 5)
 #' x = matrix(1:25, 5)
 #' 
 #' s1 + s2 # float
 #' 
-#' storage.mode(x) # integer
+#' typeof(x) # integer
 #' x + s2 # float
 #' 
 #' storage.mode(x) = "double"
 #' x + s2 # double
-#' }
 #' 
 #' @name arithmetic
 #' @rdname arithmetic

Diff for: R/bind.r

@@ -11,13 +11,11 @@
 #' A matrix of the same type as the highest precision input.
 #' 
 #' @examples
-#' \dontrun{
 #' library(float)
 #' x = fl(matrix(1:10, 5))
 #' 
 #' rbind(x, x)
 #' cbind(x, x)
-#' }
 #' 
 #' @name bind
 #' @rdname bind