From 4af90e1d3503c6ca8ce65c0805fb81cedcceebd6 Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Mon, 3 Apr 2017 21:29:46 -0400 Subject: [PATCH 1/4] Fitting functions horizontally on the page --- R/bisection.R | 2 +- R/findiff.R | 7 ++++--- R/gdls.R | 2 +- R/goldsect.R | 4 ++-- R/iterativematrix.R | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/R/bisection.R b/R/bisection.R index b90fb75..e0f2758 100644 --- 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 index 1342ca0..abcbcdf 100644 --- 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 index 00a9ba0..d9298e8 100644 --- 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 index 31ad3d4..cd666a9 100644 --- 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 index e4b03b8..af66276 100644 --- 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) From d6e5c541dca5ae652814e81a682d0328162a4676 Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Mon, 3 Apr 2017 21:32:06 -0400 Subject: [PATCH 2/4] Reference changes due to new version of Roxygen --- DESCRIPTION | 2 +- man/adaptint.Rd | 1 - man/bezier.Rd | 3 +-- man/bilinear.Rd | 11 +++++------ man/bisection.Rd | 1 - man/bvp.Rd | 1 - man/choleskymatrix.Rd | 1 - man/cmna-package.Rd | 10 +++++++++- man/cubicspline.Rd | 9 ++++----- man/detmatrix.Rd | 1 - man/division.Rd | 3 +-- man/fibonacci.Rd | 1 - man/findiff.Rd | 3 +-- man/gaussint.Rd | 7 +++---- man/gdls.Rd | 1 - man/giniquintile.Rd | 1 - man/goldsect.Rd | 3 +-- man/gradient.Rd | 7 +++---- man/heat.Rd | 1 - man/hillclimbing.Rd | 1 - man/himmelblau.Rd | 1 - man/horner.Rd | 5 ++--- man/invmatrix.Rd | 1 - man/isPrime.Rd | 1 - man/iterativematrix.Rd | 5 ++--- man/ivp.Rd | 5 ++--- man/ivpsys.Rd | 3 +-- man/linterp.Rd | 9 ++++----- man/lumatrix.Rd | 1 - man/mcint.Rd | 1 - man/midpt.Rd | 1 - man/newton.Rd | 1 - man/nn.Rd | 1 - man/nthroot.Rd | 1 - man/polyinterp.Rd | 9 ++++----- man/pwiselinterp.Rd | 9 ++++----- man/quadratic.Rd | 1 - man/refmatrix.Rd | 1 - man/resizeImage.Rd | 3 +-- man/revolution-solid.Rd | 3 +-- man/romberg.Rd | 1 - man/rowops.Rd | 5 ++--- man/sa.Rd | 1 - man/secant.Rd | 1 - man/simp.Rd | 1 - man/simp38.Rd | 1 - man/summation.Rd | 5 ++--- man/trap.Rd | 1 - man/tridiagmatrix.Rd | 1 - man/vecnorm.Rd | 1 - man/wave.Rd | 1 - man/wilkinson.Rd | 1 - 52 files changed, 54 insertions(+), 96 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b1356c6..6bc522c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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/man/adaptint.Rd b/man/adaptint.Rd index 02276af..2a2ae6f 100644 --- a/man/adaptint.Rd +++ b/man/adaptint.Rd @@ -49,4 +49,3 @@ Other newton-cotes: \code{\link{giniquintile}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/bezier.Rd b/man/bezier.Rd index 41d61e3..4310bef 100644 --- a/man/bezier.Rd +++ b/man/bezier.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/bezier.R \name{bezier} \alias{bezier} -\alias{cbezier} \alias{qbezier} +\alias{cbezier} \title{Bezier curves} \usage{ qbezier(x, y, t) @@ -45,4 +45,3 @@ Other interp: \code{\link{bilinear}}, \code{\link{nn}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}} } - diff --git a/man/bilinear.Rd b/man/bilinear.Rd index 2cd6f44..4ac8e8c 100644 --- a/man/bilinear.Rd +++ b/man/bilinear.Rd @@ -36,16 +36,15 @@ bilinear(x, y, z, newx, newy) } \seealso{ +Other interp: \code{\link{bezier}}, + \code{\link{cubicspline}}, \code{\link{linterp}}, + \code{\link{nn}}, \code{\link{polyinterp}}, + \code{\link{pwiselinterp}} + Other algebra: \code{\link{cubicspline}}, \code{\link{division}}, \code{\link{fibonacci}}, \code{\link{horner}}, \code{\link{isPrime}}, \code{\link{linterp}}, \code{\link{nthroot}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} - -Other interp: \code{\link{bezier}}, - \code{\link{cubicspline}}, \code{\link{linterp}}, - \code{\link{nn}}, \code{\link{polyinterp}}, - \code{\link{pwiselinterp}} } - diff --git a/man/bisection.Rd b/man/bisection.Rd index bac2342..5bac42b 100644 --- a/man/bisection.Rd +++ b/man/bisection.Rd @@ -41,4 +41,3 @@ Other optimz: \code{\link{goldsect}}, \code{\link{newton}}, \code{\link{sa}}, \code{\link{secant}} } - diff --git a/man/bvp.Rd b/man/bvp.Rd index 3f366e9..bb10f9d 100644 --- a/man/bvp.Rd +++ b/man/bvp.Rd @@ -35,4 +35,3 @@ bvpexample(2) ## (bvp.s <- secant(bvpexample, 0)) } - diff --git a/man/choleskymatrix.Rd b/man/choleskymatrix.Rd index b40d628..f55d12c 100644 --- a/man/choleskymatrix.Rd +++ b/man/choleskymatrix.Rd @@ -32,4 +32,3 @@ Other linear: \code{\link{detmatrix}}, \code{\link{gdls}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/cmna-package.Rd b/man/cmna-package.Rd index 37c4993..bf76872 100644 --- a/man/cmna-package.Rd +++ b/man/cmna-package.Rd @@ -16,8 +16,16 @@ accompany \emph{Computational Methods for Numerical Analysis with R} by James P. Howard, II. Together, these functions provide methods to support linear algebra, interpolation, integration, root finding, optimization, and differential equations. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://jameshoward.us/cmna/} + \item \url{https://github.com/howardjp/cmna} + \item Report bugs at \url{https://github.com/howardjp/cmna/issues} +} + } \author{ James P. Howard, II } - diff --git a/man/cubicspline.Rd b/man/cubicspline.Rd index c88cfc3..8a29ee2 100644 --- a/man/cubicspline.Rd +++ b/man/cubicspline.Rd @@ -33,15 +33,14 @@ f <- cubicspline(x, y) } \seealso{ +Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, + \code{\link{linterp}}, \code{\link{nn}}, + \code{\link{polyinterp}}, \code{\link{pwiselinterp}} + Other algebra: \code{\link{bilinear}}, \code{\link{division}}, \code{\link{fibonacci}}, \code{\link{horner}}, \code{\link{isPrime}}, \code{\link{linterp}}, \code{\link{nthroot}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} - -Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, - \code{\link{linterp}}, \code{\link{nn}}, - \code{\link{polyinterp}}, \code{\link{pwiselinterp}} } - diff --git a/man/detmatrix.Rd b/man/detmatrix.Rd index 002ef90..f2c0ff3 100644 --- a/man/detmatrix.Rd +++ b/man/detmatrix.Rd @@ -30,4 +30,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/division.Rd b/man/division.Rd index 1b5033d..310491c 100644 --- a/man/division.Rd +++ b/man/division.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/naivediv.R \name{division} \alias{division} -\alias{longdiv} \alias{naivediv} +\alias{longdiv} \title{Algorithms for divisions} \usage{ naivediv(m, n) @@ -41,4 +41,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} } - diff --git a/man/fibonacci.Rd b/man/fibonacci.Rd index 9eb8125..316541b 100644 --- a/man/fibonacci.Rd +++ b/man/fibonacci.Rd @@ -32,4 +32,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} } - diff --git a/man/findiff.Rd b/man/findiff.Rd index 9d6ee1b..447ef3f 100644 --- a/man/findiff.Rd +++ b/man/findiff.Rd @@ -2,9 +2,9 @@ % Please edit documentation in R/findiff.R \name{findiff} \alias{findiff} +\alias{symdiff} \alias{findiff2} \alias{rdiff} -\alias{symdiff} \title{Finite Differences} \usage{ findiff(f, x, h = x * sqrt(.Machine$double.eps)) @@ -41,4 +41,3 @@ findiff(sin, pi, 1e-3) symdiff(sin, pi, 1e-3) } - diff --git a/man/gaussint.Rd b/man/gaussint.Rd index e07698a..cd2e913 100644 --- a/man/gaussint.Rd +++ b/man/gaussint.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/gaussint.R \name{gaussint} -\alias{gauss.hermite} -\alias{gauss.laguerre} -\alias{gauss.legendre} \alias{gaussint} +\alias{gauss.legendre} +\alias{gauss.laguerre} +\alias{gauss.hermite} \title{Gaussian integration method driver} \usage{ gaussint(f, x, w) @@ -49,4 +49,3 @@ Other integration: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/gdls.Rd b/man/gdls.Rd index 6ab871c..b37027c 100644 --- a/man/gdls.Rd +++ b/man/gdls.Rd @@ -39,4 +39,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/giniquintile.Rd b/man/giniquintile.Rd index 8a91bd0..1dbaa18 100644 --- a/man/giniquintile.Rd +++ b/man/giniquintile.Rd @@ -40,4 +40,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/goldsect.Rd b/man/goldsect.Rd index a357f66..c834f89 100644 --- a/man/goldsect.Rd +++ b/man/goldsect.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/goldsect.R \name{goldsect} \alias{goldsect} -\alias{goldsectmax} \alias{goldsectmin} +\alias{goldsectmax} \title{Golden Section Search} \usage{ goldsectmin(f, a, b, tol = 0.001, m = 100) @@ -45,4 +45,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{newton}}, \code{\link{sa}}, \code{\link{secant}} } - diff --git a/man/gradient.Rd b/man/gradient.Rd index 23dce85..3792174 100644 --- a/man/gradient.Rd +++ b/man/gradient.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/gradesc.R \name{gradient} -\alias{gd} -\alias{gradasc} -\alias{graddsc} \alias{gradient} +\alias{graddsc} +\alias{gradasc} +\alias{gd} \title{Gradient descent} \usage{ graddsc(fp, x, h = 0.001, tol = 1e-04, m = 1000) @@ -56,4 +56,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{newton}}, \code{\link{sa}}, \code{\link{secant}} } - diff --git a/man/heat.Rd b/man/heat.Rd index 9fff820..af89d03 100644 --- a/man/heat.Rd +++ b/man/heat.Rd @@ -38,4 +38,3 @@ n <- 25 z <- heat(u, alpha, xdelta, tdelta, n) } - diff --git a/man/hillclimbing.Rd b/man/hillclimbing.Rd index 5440878..c24c708 100644 --- a/man/hillclimbing.Rd +++ b/man/hillclimbing.Rd @@ -39,4 +39,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{newton}}, \code{\link{sa}}, \code{\link{secant}} } - diff --git a/man/himmelblau.Rd b/man/himmelblau.Rd index 8a4b0a7..0d22969 100644 --- a/man/himmelblau.Rd +++ b/man/himmelblau.Rd @@ -18,4 +18,3 @@ Generate the Himmelblau function \details{ Generate the Himmelblau function } - diff --git a/man/horner.Rd b/man/horner.Rd index c62c3fe..30df1fd 100644 --- a/man/horner.Rd +++ b/man/horner.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/horner.R \name{horner} -\alias{betterpoly} \alias{horner} -\alias{naivepoly} \alias{rhorner} +\alias{naivepoly} +\alias{betterpoly} \title{Horner's rule} \usage{ horner(x, coefs) @@ -62,4 +62,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} } - diff --git a/man/invmatrix.Rd b/man/invmatrix.Rd index 9705bcc..e3e049b 100644 --- a/man/invmatrix.Rd +++ b/man/invmatrix.Rd @@ -31,4 +31,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/isPrime.Rd b/man/isPrime.Rd index 028ca4c..c7a6d61 100644 --- a/man/isPrime.Rd +++ b/man/isPrime.Rd @@ -34,4 +34,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} } - diff --git a/man/iterativematrix.Rd b/man/iterativematrix.Rd index 43f6274..5153c20 100644 --- a/man/iterativematrix.Rd +++ b/man/iterativematrix.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/iterativematrix.R \name{iterativematrix} -\alias{cgmmatrix} -\alias{gaussseidel} \alias{iterativematrix} \alias{jacobi} +\alias{gaussseidel} +\alias{cgmmatrix} \title{Solve a matrix using iterative methods} \usage{ jacobi(A, b, tol = 1e-06, maxiter = 100) @@ -56,4 +56,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/ivp.Rd b/man/ivp.Rd index 6daf484..9b7906e 100644 --- a/man/ivp.Rd +++ b/man/ivp.Rd @@ -1,11 +1,11 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/ivp.R \name{ivp} -\alias{adamsbashforth} -\alias{euler} \alias{ivp} +\alias{euler} \alias{midptivp} \alias{rungekutta4} +\alias{adamsbashforth} \title{Initial value problems} \usage{ euler(f, x0, y0, h, n) @@ -45,4 +45,3 @@ ivp.euler <- euler(f, 0, 1, 1/100, 100) ivp.midpt <- midptivp(f, 0, 1, 1/100, 100) ivp.rk4 <- rungekutta4(f, 0, 1, 1/100, 100) } - diff --git a/man/ivpsys.Rd b/man/ivpsys.Rd index 28e0e13..3edafd8 100644 --- a/man/ivpsys.Rd +++ b/man/ivpsys.Rd @@ -1,8 +1,8 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/ivpsys.R \name{ivpsys} -\alias{eulersys} \alias{ivpsys} +\alias{eulersys} \title{Initial value problems for systems of ordinary differential equations} \usage{ eulersys(f, x0, y0, h, n) @@ -34,4 +34,3 @@ value problems using the second-order Runge-Kutta method. The f <- function(x, y) { y / (2 * x + 1) } ivp.euler <- euler(f, 0, 1, 1/100, 100) } - diff --git a/man/linterp.Rd b/man/linterp.Rd index 9a70e36..c3c0d55 100644 --- a/man/linterp.Rd +++ b/man/linterp.Rd @@ -29,15 +29,14 @@ f <- linterp(3, 2, 7, -2) } \seealso{ +Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, + \code{\link{cubicspline}}, \code{\link{nn}}, + \code{\link{polyinterp}}, \code{\link{pwiselinterp}} + Other algebra: \code{\link{bilinear}}, \code{\link{cubicspline}}, \code{\link{division}}, \code{\link{fibonacci}}, \code{\link{horner}}, \code{\link{isPrime}}, \code{\link{nthroot}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} - -Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, - \code{\link{cubicspline}}, \code{\link{nn}}, - \code{\link{polyinterp}}, \code{\link{pwiselinterp}} } - diff --git a/man/lumatrix.Rd b/man/lumatrix.Rd index a24198b..fb637e9 100644 --- a/man/lumatrix.Rd +++ b/man/lumatrix.Rd @@ -31,4 +31,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/mcint.Rd b/man/mcint.Rd index 5b6a9f4..265677f 100644 --- a/man/mcint.Rd +++ b/man/mcint.Rd @@ -48,4 +48,3 @@ Other integration: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/midpt.Rd b/man/midpt.Rd index c78377a..35a1c70 100644 --- a/man/midpt.Rd +++ b/man/midpt.Rd @@ -47,4 +47,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/newton.Rd b/man/newton.Rd index 2c8479f..4dbc0c9 100644 --- a/man/newton.Rd +++ b/man/newton.Rd @@ -41,4 +41,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{hillclimbing}}, \code{\link{sa}}, \code{\link{secant}} } - diff --git a/man/nn.Rd b/man/nn.Rd index bbd8cae..37a6a4b 100644 --- a/man/nn.Rd +++ b/man/nn.Rd @@ -34,4 +34,3 @@ Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, \code{\link{cubicspline}}, \code{\link{linterp}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}} } - diff --git a/man/nthroot.Rd b/man/nthroot.Rd index 91e9a38..23d24c1 100644 --- a/man/nthroot.Rd +++ b/man/nthroot.Rd @@ -37,4 +37,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} } - diff --git a/man/polyinterp.Rd b/man/polyinterp.Rd index 24ac2b2..028db5f 100644 --- a/man/polyinterp.Rd +++ b/man/polyinterp.Rd @@ -27,15 +27,14 @@ f <- polyinterp(x, y) } \seealso{ +Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, + \code{\link{cubicspline}}, \code{\link{linterp}}, + \code{\link{nn}}, \code{\link{pwiselinterp}} + Other algebra: \code{\link{bilinear}}, \code{\link{cubicspline}}, \code{\link{division}}, \code{\link{fibonacci}}, \code{\link{horner}}, \code{\link{isPrime}}, \code{\link{linterp}}, \code{\link{nthroot}}, \code{\link{pwiselinterp}}, \code{\link{quadratic}} - -Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, - \code{\link{cubicspline}}, \code{\link{linterp}}, - \code{\link{nn}}, \code{\link{pwiselinterp}} } - diff --git a/man/pwiselinterp.Rd b/man/pwiselinterp.Rd index 3f4fbcd..aa869cd 100644 --- a/man/pwiselinterp.Rd +++ b/man/pwiselinterp.Rd @@ -37,15 +37,14 @@ f <- pwiselinterp(x, y) } \seealso{ +Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, + \code{\link{cubicspline}}, \code{\link{linterp}}, + \code{\link{nn}}, \code{\link{polyinterp}} + Other algebra: \code{\link{bilinear}}, \code{\link{cubicspline}}, \code{\link{division}}, \code{\link{fibonacci}}, \code{\link{horner}}, \code{\link{isPrime}}, \code{\link{linterp}}, \code{\link{nthroot}}, \code{\link{polyinterp}}, \code{\link{quadratic}} - -Other interp: \code{\link{bezier}}, \code{\link{bilinear}}, - \code{\link{cubicspline}}, \code{\link{linterp}}, - \code{\link{nn}}, \code{\link{polyinterp}} } - diff --git a/man/quadratic.Rd b/man/quadratic.Rd index ee339b7..a99d734 100644 --- a/man/quadratic.Rd +++ b/man/quadratic.Rd @@ -42,4 +42,3 @@ Other algebra: \code{\link{bilinear}}, \code{\link{nthroot}}, \code{\link{polyinterp}}, \code{\link{pwiselinterp}} } - diff --git a/man/refmatrix.Rd b/man/refmatrix.Rd index 9d2cbb8..7de737d 100644 --- a/man/refmatrix.Rd +++ b/man/refmatrix.Rd @@ -48,4 +48,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{lumatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/resizeImage.Rd b/man/resizeImage.Rd index 4b11034..55a6269 100644 --- a/man/resizeImage.Rd +++ b/man/resizeImage.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/resizeImage.R \name{resizeImage} \alias{resizeImage} -\alias{resizeImageBL} \alias{resizeImageNN} +\alias{resizeImageBL} \title{Image resizing} \usage{ resizeImageNN(imx, width, height) @@ -28,4 +28,3 @@ The \var{resizeImageNN} function uses the nearest neighbor method to resize the image. Also, \var{resizeImageBL} uses bilinear interpolation to resize the image. } - diff --git a/man/revolution-solid.Rd b/man/revolution-solid.Rd index e2a0537..fe954fc 100644 --- a/man/revolution-solid.Rd +++ b/man/revolution-solid.Rd @@ -1,9 +1,9 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/revolution-solid.R \name{revolution-solid} -\alias{discmethod} \alias{revolution-solid} \alias{shellmethod} +\alias{discmethod} \title{Volumes of solids of revolution} \usage{ shellmethod(f, a, b) @@ -43,4 +43,3 @@ Other integration: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/romberg.Rd b/man/romberg.Rd index c92d493..5001b64 100644 --- a/man/romberg.Rd +++ b/man/romberg.Rd @@ -49,4 +49,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{simp38}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/rowops.Rd b/man/rowops.Rd index cfa0047..7d9abed 100644 --- a/man/rowops.Rd +++ b/man/rowops.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/rowops.R \name{rowops} -\alias{replacerow} \alias{rowops} -\alias{scalerow} \alias{swaprows} +\alias{replacerow} +\alias{scalerow} \title{Elementary row operations} \usage{ swaprows(m, row1, row2) @@ -51,4 +51,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{lumatrix}}, \code{\link{refmatrix}}, \code{\link{tridiagmatrix}}, \code{\link{vecnorm}} } - diff --git a/man/sa.Rd b/man/sa.Rd index 15c35af..e036ad2 100644 --- a/man/sa.Rd +++ b/man/sa.Rd @@ -42,4 +42,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{hillclimbing}}, \code{\link{newton}}, \code{\link{secant}} } - diff --git a/man/secant.Rd b/man/secant.Rd index a640942..46d7c5f 100644 --- a/man/secant.Rd +++ b/man/secant.Rd @@ -38,4 +38,3 @@ Other optimz: \code{\link{bisection}}, \code{\link{hillclimbing}}, \code{\link{newton}}, \code{\link{sa}} } - diff --git a/man/simp.Rd b/man/simp.Rd index da07db0..89e5535 100644 --- a/man/simp.Rd +++ b/man/simp.Rd @@ -47,4 +47,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp38}}, \code{\link{trap}} } - diff --git a/man/simp38.Rd b/man/simp38.Rd index 3d20ce7..2ea25c3 100644 --- a/man/simp38.Rd +++ b/man/simp38.Rd @@ -47,4 +47,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp}}, \code{\link{trap}} } - diff --git a/man/summation.Rd b/man/summation.Rd index e963c04..10598e1 100644 --- a/man/summation.Rd +++ b/man/summation.Rd @@ -1,10 +1,10 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/naivesum.R \name{summation} -\alias{kahansum} +\alias{summation} \alias{naivesum} +\alias{kahansum} \alias{pwisesum} -\alias{summation} \title{Two summing algorithms} \usage{ naivesum(x) @@ -42,4 +42,3 @@ naivesum(x) kahansum(x) pwisesum(x) } - diff --git a/man/trap.Rd b/man/trap.Rd index 682b7ac..6a6328a 100644 --- a/man/trap.Rd +++ b/man/trap.Rd @@ -47,4 +47,3 @@ Other newton-cotes: \code{\link{adaptint}}, \code{\link{romberg}}, \code{\link{simp38}}, \code{\link{simp}} } - diff --git a/man/tridiagmatrix.Rd b/man/tridiagmatrix.Rd index 07b55ad..e86edf6 100644 --- a/man/tridiagmatrix.Rd +++ b/man/tridiagmatrix.Rd @@ -32,4 +32,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{lumatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{vecnorm}} } - diff --git a/man/vecnorm.Rd b/man/vecnorm.Rd index 5c869be..00a329f 100644 --- a/man/vecnorm.Rd +++ b/man/vecnorm.Rd @@ -30,4 +30,3 @@ Other linear: \code{\link{choleskymatrix}}, \code{\link{lumatrix}}, \code{\link{refmatrix}}, \code{\link{rowops}}, \code{\link{tridiagmatrix}} } - diff --git a/man/wave.Rd b/man/wave.Rd index 5ff4f37..049f86f 100644 --- a/man/wave.Rd +++ b/man/wave.Rd @@ -39,4 +39,3 @@ tdelta <- .02 n <- 40 z <- wave(u, speed, xdelta, tdelta, n) } - diff --git a/man/wilkinson.Rd b/man/wilkinson.Rd index d87ef43..acd4dd3 100644 --- a/man/wilkinson.Rd +++ b/man/wilkinson.Rd @@ -29,4 +29,3 @@ value is f(x) = (x - 1)(x - 2)...(x - n). The default of \code{n} is wilkinson(0) } - From 36c9cf2c23c5bcebe5b429ace40f44370d5015ea Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Tue, 4 Apr 2017 20:20:23 -0400 Subject: [PATCH 3/4] Updated citation information --- inst/CITATION | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/inst/CITATION b/inst/CITATION index 4a871b6..330485e 100644 --- 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 = "jh@jameshoward.us"), - 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 = "jh@jameshoward.us"), + year = 2017, + publisher = "Chapman and Hall/CRC", + series = "Numerical Analysis and Scientific Computing Series", url = "https://jameshoward.us/cmna") From b034d5fef5288ec80bc6bcc3faa939949254b25c Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Wed, 5 Apr 2017 19:52:21 -0400 Subject: [PATCH 4/4] Version bump to 0.3.1 --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6bc522c..39db985 100644 --- 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 = "jh@jameshoward.us", role = c("aut", "cre")) URL: https://jameshoward.us/cmna/,