fixes #92

Author: RobinHankin

NAMESPACE

@@ -31,6 +31,8 @@ importFrom(disordR,hash)
 importFrom(disordR,consistent)
 importFrom(disordR,drop)
 
+importFrom("stats", "runif")
+
 S3method("as.function",ktensor)
 S3method("as.function",kform)
 S3method(Ops,kform)

NEWS.md

@@ -1,5 +1,6 @@
 # stokes 1.2-3
 
+- consistentification of rform() and rtensor()
 - new vignette on phi()
 
 

R/mult.R

@@ -204,25 +204,33 @@
     })
 }
 
-`rform` <- function(terms=9, k=3, n=7, coeffs, ensure=TRUE){
-  if(missing(coeffs)){coeffs <- seq_len(terms)}
+`rform` <- function(terms=9, k=3, n=7, ensure=TRUE, integer=TRUE){
   ind <- t(replicate(terms,sample(seq_len(n),k)))
   if(ensure & all(ind)<n){ind[sample(which(ind==max(ind)),1)] <- n}
-  kform(spray(ind,coeffs,addrepeats=TRUE))
+  if(integer){
+      coeffs <- seq_len(terms)
+  } else {
+      coeffs <- runif(terms)
+  }
+  kform(spray(ind, coeffs, addrepeats=TRUE))
 }
 
-`rformm` <- function(terms=30, k=7, n=20, coeffs, ensure=TRUE){
-    rform(terms=terms, k=k, n=n, coeffs=coeffs, ensure=ensure)
+`rformm` <- function(terms=30, k=7, n=20, ensure=TRUE, integer=TRUE){
+    rform(terms=terms, k=k, n=n, ensure=ensure)
 }
 
-`rformmm` <- function(terms=90, k=15, n=30, coeffs, ensure=TRUE){
-    rform(terms=terms, k=k, n=n, coeffs=coeffs, ensure=ensure)
+`rformmm` <- function(terms=90, k=15, n=30, ensure=TRUE, integer=TRUE){
+    rform(terms=terms, k=k, n=n, ensure=ensure)
 }
 
-`rtensor` <- function(terms=9, k=3, n=7, coeffs){
-    if(missing(coeffs)){coeffs <- seq_len(terms)}
-    M <- matrix(sample(seq_len(n),terms*k,replace=TRUE),terms,k)
-    ktensor(spray(M,seq_len(terms),addrepeats=TRUE))
+`rtensor` <- function(terms=9, k=3, n=7, integer=TRUE){
+    M <- matrix(sample(seq_len(n), terms*k, replace=TRUE), terms, k)
+    if(integer){
+        coeffs <- seq_len(terms)
+    } else {
+        coeffs <- runif(terms)
+    }
+    ktensor(spray(M, coeffs, addrepeats=TRUE))
 }
 
 `as.1form` <- function(v){

man/rform.Rd

@@ -10,21 +10,21 @@
   Random \eqn{k}-form objects and \eqn{k}-tensors,
   intended as quick \dQuote{get you going} examples}
 \usage{
-rform(terms=9, k=3, n=7, coeffs, ensure=TRUE)
-rformm(terms=30, k=7, n=20, coeffs, ensure=TRUE)
-rformmm(terms=90, k=15, n=30, coeffs, ensure=TRUE)
-rtensor(terms=9,k=3,n=7,coeffs)
+rform(terms=9, k=3, n=7,  ensure=TRUE, integer=TRUE)
+rformm(terms=30, k=7, n=20, ensure=TRUE, integer=TRUE)
+rformmm(terms=90, k=15, n=30, ensure=TRUE, integer=TRUE)
+rtensor(terms=9, k=3, n=7, integer=TRUE)
 }
 \arguments{
   \item{terms}{Number of distinct terms}
   \item{k, n}{A \eqn{k}-form maps \eqn{V^k} to
     \eqn{\mathbb{R}}{R}, where \eqn{V=\mathbb{R}^n}{V=R^n}}
-  \item{coeffs}{The coefficients of the form; if missing use
-    \code{seq_len(terms)}}
   \item{ensure}{Boolean with default \code{TRUE} meaning to ensure that
     the \code{dovs()} of the returned value is in fact equal to
     \code{n}.  If \code{FALSE}, sometimes the \code{dovs()} is strictly
     less than \code{n} because of random sampling}
+  \item{integer}{Boolean specifying whether the coefficients are
+    integers or not}
 }
 \details{
   Random \eqn{k}-form objects and \eqn{k}-tensors.
@@ -55,4 +55,6 @@ a ^ dx ^ dy
 (x <- rtensor())
 x \%X\% x
 
+
+
 }

man/stokes-package.Rd

@@ -54,7 +54,7 @@ U1 \%X\% U2
 ## A k-form is an alternating k-tensor:
 K1 <- as.kform(cbind(1:5,2:6),rnorm(5))
 K2 <- kform_general(3:6,2,1:6)
-K3 <- rform(9,3,9,runif(9))
+K3 <- rform(9,3,9)
 
 ## The distributive law is true
 

tests/testthat/test_alt.R

@@ -27,7 +27,7 @@ test_that("Function Alt() behaves itself", {
         terms <- sample(2:4,1)
         k <- sample(3:4,1)
         n <- sample(2:4,1)
-        S <- rtensor(terms,k,n,rnorm(terms))
+        S <- rtensor(terms,k,n,integer=FALSE)
         foo(S)
         V <- matrix(rnorm(k*n),ncol=k)
         bar(S,V)

tests/testthat/test_contract.R

@@ -18,7 +18,7 @@ test_that("Function contract() behaves itself", {
 
 
     for(i in 1:2){
-        o <- rform(2,k=5,n=9,coeffs=runif(2))
+        o <- rform(2, k=5, n=9, integer=FALSE)
         V <- matrix(rnorm(45),ncol=5)
         foo(o,V)
     }

tests/testthat/test_cross.R

@@ -39,9 +39,9 @@ test_that("Tensor product is distributive and associative", {
       terms <- rpois(1,20)
       k <- sample(3:10,1)
       n <- k+sample(3:10,1)
-      T1 <- rtensor(terms,k,n,rnorm(terms))
-      T2 <- rtensor(terms+1,k,n,rnorm(terms+1))
-      T3 <- rtensor(terms+2,k,n,rnorm(terms+2))
+      T1 <- rtensor(terms,k,n,integer=FALSE)
+      T2 <- rtensor(terms+1,k,n,integer=FALSE)
+      T3 <- rtensor(terms+2,k,n,integer=FALSE)
       foo3(T1,T2,T3)
     }
 })
@@ -65,8 +65,8 @@ test_that("tensorprod() is in fact a tensor product", {
       terms <- rpois(1,20)
       k <- sample(3:10,1)
       n <- k+sample(3:10,1)
-      T1 <- rtensor(terms,k,n,rnorm(terms))
-      T2 <- rtensor(terms+1,k,n,rnorm(terms+1))
+      T1 <- rtensor(terms,k,n,integer=FALSE)
+      T2 <- rtensor(terms+1,k,n,integer=FALSE)
       foo2(T1,T2)
     }
 })
@@ -100,7 +100,7 @@ test_that("ktensors are multilinear", {
        terms <- rpois(1,20)
        k <- sample(3:10,1)
        n <- k+sample(3:10,1)
-       TT <- rtensor(terms,k,n,rnorm(terms))
+       TT <- rtensor(terms,k,n,integer=FALSE)
        foo1(TT)
      }
 

tests/testthat/test_ops.R

@@ -18,16 +18,16 @@ test_that("Cross product Ops behave", {
     terms <- rpois(1,20)
     k <- sample(3:10,1)
     n <- k+sample(3:10,1)
-    S <- rform(terms,k,n,sample(terms))
+    S <- rform(terms,k,n)
     foo1(S)
   }
 
   for(i in 1:10){
     terms <- rpois(1,20)
     k <- sample(3:10,1)
     n <- k+sample(3:10,1)
-    S1 <- rform(terms,k,n,sample(terms))
-    S2 <- rform(terms,k,n,sample(terms))
+    S1 <- rform(terms,k,n)
+    S2 <- rform(terms,k,n)
     foo2(S1,S2)
   }
 
@@ -39,16 +39,16 @@ test_that("Wedge product Ops behave", {
     terms <- rpois(1,20)
     k <- sample(3:10,1)
     n <- k+sample(3:10,1)
-    K <- rform(terms,k,n,sample(terms))
+    K <- rform(terms,k,n)
     foo1(K)
   }
 
   for(i in 1:10){
     terms <- rpois(1,20)
     k <- sample(3:10,1)
     n <- k+sample(3:10,1)
-    K1 <- rform(terms,k,n,sample(terms))
-    K2 <- rform(terms,k,n,sample(terms))
+    K1 <- rform(terms,k,n)
+    K2 <- rform(terms,k,n)
     foo2(K1,K2)
   }
 })

tests/testthat/test_transform.R

@@ -25,7 +25,7 @@ test_that("Function pullback() behaves itself", {
     } # foo() closes
 
     for(i in 1:3){
-        o <-  rform(terms=3,k=2,n=5,coeffs=rnorm(3))
+        o <-  rform(terms=3, k=2, n=5, integer=FALSE)
         randmat <- expression(matrix(rnorm(25),5,5))
         isbigdet <- function(x,min_det = 0.01){abs(det(x)) > min_det}
         M <- getgood(randmat, isbigdet, default=diag(5), min_det=0.1)