Merge branch 'release/v0.3.1'

k3jph · Apr 5, 2017 · b45d500 · b45d500
2 parents 819f9c1 + b034d5f
commit b45d500
Show file tree

Hide file tree

Showing 58 changed files with 73 additions and 116 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: cmna
 Type: Package
 Title: Computational Methods for Numerical Analysis
-Version: 0.3.0
-Date: 2016-09-18
+Version: 0.3.1
+Date: 2017-04-03
 Authors@R: person(given = "James P.", family = "Howard, II",
 		          email = "[email protected]", role = c("aut", "cre"))
 URL: https://jameshoward.us/cmna/,
@@ -16,5 +16,5 @@ License: BSD_2_clause + file LICENSE
 LazyLoad: no
 Suggests:
     testthat
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
 Depends: R (>= 2.10)
diff --git a/R/bisection.R b/R/bisection.R
@@ -60,7 +60,7 @@ bisection <- function(f, a, b, tol = 1e-3, m = 100) {
     while (abs(b - a) > tol) {
         iter <- iter + 1
         if (iter > m) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
         xmid <- (a + b) / 2

diff --git a/R/findiff.R b/R/findiff.R
@@ -53,14 +53,15 @@
 #' symdiff(sin, pi, 1e-3)
 #'
 #' @export
-findiff <- function(f, x, h = x * sqrt(.Machine$double.eps)) {
+findiff <- function(f, x,
+               h = x * sqrt(.Machine$double.eps)) {
     return((f(x + h) - f(x)) / h)
 }
 
 #' @rdname findiff
 #' @export
-symdiff <- function(f, x, h = x * .Machine$double.eps^(1/3)) {
-
+symdiff <- function(f, x,
+               h = x * .Machine$double.eps^(1/3)) {
     return((f(x + h) - f(x - h)) / (2 * h))
 }
 

diff --git a/R/gdls.R b/R/gdls.R
@@ -59,7 +59,7 @@ gdls <- function(A, b, alpha = 0.05, tol = 1e-6, m = 1e5) {
 
     while(vecnorm(oldtheta - theta) > tol) {
         if((iter <- iter + 1) > m) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             return(theta)
         }
         e <- (A %*% theta - b)

diff --git a/R/goldsect.R b/R/goldsect.R
@@ -65,7 +65,7 @@ goldsectmin <- function(f, a, b, tol = 1e-3, m = 100) {
     while (abs(b - a) > tol) {
         iter <- iter + 1
         if (iter > m) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
 
@@ -95,7 +95,7 @@ goldsectmax <- function(f, a, b, tol = 1e-3, m = 100) {
     while (abs(b - a) > tol) {
         iter <- iter + 1
         if (iter > m) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
 

diff --git a/R/iterativematrix.R b/R/iterativematrix.R
@@ -73,7 +73,7 @@ jacobi <- function(A, b, tol = 10e-7, maxiter = 100) {
 
     while(vecnorm(newx - x) > tol) {
         if(maxiter > iter) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
         x <- newx
@@ -100,7 +100,7 @@ gaussseidel <- function(A, b, tol = 10e-7, maxiter = 100) {
 
     while(vecnorm(newx - x) > tol) {
         if(maxiter > iter) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
         x <- newx
@@ -123,7 +123,7 @@ cgmmatrix <- function(A, b, tol = 10e-7, maxiter = 100) {
     p <- r <- b - A %*% x
     while(vecnorm(r) > tol) {
         if(maxiter > iter) {
-            warning("maximum number of iterations exceeded")
+            warning("iterations maximum exceeded")
             break
         }
 		a <- as.numeric((t(r) %*% r) / t(p) %*% A %*% p)

diff --git a/inst/CITATION b/inst/CITATION
@@ -1,9 +1,7 @@
-year <- sub("-.*", "", meta$Date)
-note <- sprintf("R package version %s", meta$Version)
-
-bibentry(bibtype = "Manual",
-         title = "Computational Methods for Numerical Analysis",
-         author = person("James P.", "{Howard, II}", email = "[email protected]"),
-         year = year,
-         note = note,
+bibentry(bibtype = "Book",
+         title = "Computational Methods for Numerical Analysis with R",
+         author = person(c("James", "P."), "Howard", role = c("aut", "cre"), email = "[email protected]"),
+         year = 2017,
+         publisher = "Chapman and Hall/CRC",
+         series = "Numerical Analysis and Scientific Computing Series",
          url = "https://jameshoward.us/cmna")
diff --git a/man/adaptint.Rd b/man/adaptint.Rd
diff --git a/man/bezier.Rd b/man/bezier.Rd
diff --git a/man/bilinear.Rd b/man/bilinear.Rd
diff --git a/man/bisection.Rd b/man/bisection.Rd
diff --git a/man/bvp.Rd b/man/bvp.Rd
diff --git a/man/choleskymatrix.Rd b/man/choleskymatrix.Rd
diff --git a/man/cmna-package.Rd b/man/cmna-package.Rd
diff --git a/man/cubicspline.Rd b/man/cubicspline.Rd
diff --git a/man/detmatrix.Rd b/man/detmatrix.Rd
diff --git a/man/division.Rd b/man/division.Rd
diff --git a/man/fibonacci.Rd b/man/fibonacci.Rd
diff --git a/man/findiff.Rd b/man/findiff.Rd
diff --git a/man/gaussint.Rd b/man/gaussint.Rd
diff --git a/man/gdls.Rd b/man/gdls.Rd
diff --git a/man/giniquintile.Rd b/man/giniquintile.Rd
diff --git a/man/goldsect.Rd b/man/goldsect.Rd
diff --git a/man/gradient.Rd b/man/gradient.Rd
diff --git a/man/heat.Rd b/man/heat.Rd
diff --git a/man/hillclimbing.Rd b/man/hillclimbing.Rd
diff --git a/man/himmelblau.Rd b/man/himmelblau.Rd
diff --git a/man/horner.Rd b/man/horner.Rd
diff --git a/man/invmatrix.Rd b/man/invmatrix.Rd
diff --git a/man/isPrime.Rd b/man/isPrime.Rd
diff --git a/man/iterativematrix.Rd b/man/iterativematrix.Rd
diff --git a/man/ivp.Rd b/man/ivp.Rd