Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
howardjp committed Jul 6, 2020
2 parents 5fc25f2 + 72ac922 commit 70bd68d
Show file tree
Hide file tree
Showing 125 changed files with 97 additions and 14,356 deletions.
9 changes: 6 additions & 3 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
data-raw
docs
COPYRIGHT.md
^_pkgdown.yml$
^.github
^_pkgdown\.yml$
^docs$
^pkgdown$
^\.github$
^data-raw$
49 changes: 49 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
on:
push:
branches: master

name: pkgdown

jobs:
pkgdown:
runs-on: macOS-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@master

- uses: r-lib/actions/setup-pandoc@master

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Cache R packages
uses: actions/cache@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install dependencies
run: |
install.packages("remotes")
remotes::install_deps(dependencies = TRUE)
remotes::install_dev("pkgdown")
shell: Rscript {0}

- name: Generate documentation
run: devtools::document()
shell: Rscript {0}

- name: Install package
run: R CMD INSTALL .

- name: Deploy package
run: pkgdown::deploy_to_branch(new_process = FALSE)
shell: Rscript {0}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.Rproj.user
.Rhistory
.RData
inst/doc
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ r:
r_packages:
- testthat
- covr
- markdown
- roxygen2
- devtools

before_script:
- Rscript -e 'devtools::document()'

after_success:
- Rscript -e 'covr::coveralls()'
- Rscript -e 'library(covr); codecov()'

2 changes: 1 addition & 1 deletion COPYRIGHT.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Simplified BSD License
======================

_Copyright © 2016-2019, James P. Howard, II <<[email protected]>>_
_Copyright © 2016-2020, James P. Howard, II <<[email protected]>>_
_All rights reserved._

Redistribution and use in source and binary forms, with or without
Expand Down
16 changes: 9 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
Package: cmna
Type: Package
Title: Computational Methods for Numerical Analysis
Version: 1.0.2
Date: 2019-07-23
Version: 1.0.3
Date: 2020-07-05
Encoding: UTF-8
Authors@R: person(given = "James", family = "Howard",
email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-4530-1547"))
URL: https://howardjp.github.io/cmna/
BugReports: https://github.com/howardjp/cmna/issues
URL: https://jameshoward.us/cmna
BugReports: https://github.com/k3jph/cmna-pkg/issues
Description: Provides the source and examples for James P. Howard, II,
"Computational Methods for Numerical Analysis with R,"
<http://howardjp.github.io/cmna/>, a book on numerical
<https://jameshoward.us/cmna>, a book on numerical
methods in R.
License: BSD_2_clause + file LICENSE
LazyLoad: no
Suggests:
testthat
RoxygenNote: 6.1.1
testthat,
devtools,
markdown,
roxygen2
Depends: R (>= 2.10)
85 changes: 0 additions & 85 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,86 +1 @@
# Generated by roxygen2: do not edit by hand

export(adamsbashforth)
export(adaptint)
export(betterpoly)
export(bilinear)
export(bisection)
export(bvpexample)
export(bvpexample10)
export(cbezier)
export(cgmmatrix)
export(choleskymatrix)
export(cubicspline)
export(detmatrix)
export(discmethod)
export(euler)
export(eulersys)
export(fibonacci)
export(findiff)
export(findiff2)
export(gauss.hermite)
export(gauss.laguerre)
export(gauss.legendre)
export(gaussint)
export(gaussseidel)
export(gd)
export(gdls)
export(giniquintile)
export(goldsectmax)
export(goldsectmin)
export(gradasc)
export(graddsc)
export(heat)
export(hillclimbing)
export(himmelblau)
export(horner)
export(invmatrix)
export(isPrime)
export(jacobi)
export(kahansum)
export(linterp)
export(longdiv)
export(lumatrix)
export(mcint)
export(mcint2)
export(midpt)
export(midptivp)
export(naivediv)
export(naivepoly)
export(naivesum)
export(newton)
export(nn)
export(nthroot)
export(polyinterp)
export(pwiselinterp)
export(pwisesum)
export(qbezier)
export(quadratic)
export(quadratic2)
export(rdiff)
export(refmatrix)
export(replacerow)
export(resizeImageBL)
export(resizeImageNN)
export(rhorner)
export(romberg)
export(rrefmatrix)
export(rungekutta4)
export(sa)
export(scalerow)
export(secant)
export(shellmethod)
export(simp)
export(simp38)
export(solvematrix)
export(swaprows)
export(symdiff)
export(trap)
export(tridiagmatrix)
export(tspsa)
export(vecnorm)
export(wave)
export(wilkinson)
importFrom(stats,rnorm)
importFrom(stats,runif)
importFrom(utils,tail)
23 changes: 19 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
# Computational Methods for Numerical Analysis

[![Build Status](https://img.shields.io/travis/howardjp/cmna.svg)](https://travis-ci.org/howardjp/cmna)
[![Coverage Status](https://img.shields.io/coveralls/github/howardjp/cmna.svg)](https://coveralls.io/github/howardjp/cmna?branch=master)
[![Build Status](https://travis-ci.org/k3jph/cmna-pkg.svg?branch=master)](https://travis-ci.org/k3jph/cmna-pkg)
[![Coverage Status](https://coveralls.io/repos/github/k3jph/cmna-pkg/badge.svg?branch=develop)](https://coveralls.io/github/k3jph/cmna-pkg?branch=develop)
[![codecov](https://codecov.io/gh/k3jph/cmna-pkg/branch/master/graph/badge.svg)](https://codecov.io/gh/k3jph/cmna-pkg)
[![Downloads from the RStudio CRAN mirror](https://cranlogs.r-pkg.org/badges/cmna)](https://cran.r-project.org/package=cmna)
[![Package DOI](https://img.shields.io/badge/Package_DOI-10.5281%2Fzenodo.3249230-blue.svg)](https://doi.org/10.5281/zenodo.3249230)
[![Book DOI](https://img.shields.io/badge/Book_DOI-10.1201%2F9781315120195-blue.svg)](https://doi.org/10.1201/9781315120195)

This is the R package to support _Computational Methods for Numerical
Analysis with R_ by James P. Howard, II.

_Computational Methods for Numerical Analysis with R_ is an overview
of traditional numerical analysis topics presented using R. This
guide shows how common functions from linear algebra, interpolation,
numerical integration, optimization, and differential equations can
be implemented in pure R code. Every algorithm described is given
with a complete function implementation in R, along with examples
to demonstrate the function and its use.

_Computational Methods for Numerical Analysis with R_ with R is
intended for those who already know R, but are interested in learning
more about how the underlying algorithms work. As such, it is
suitable for statisticians, economists, and engineers, and others
with a computational and numerical background.

## Algorithms included

* Elementary and Example Algorithms
Expand Down Expand Up @@ -120,6 +135,7 @@ Analysis with R_ by James P. Howard, II.

* testthat
* roxygen2
* markdown

## Contribution guidelines

Expand All @@ -129,6 +145,5 @@ Analysis with R_ by James P. Howard, II.

## For more information

* [Website for CMNA](https://howardjp.github.io/cmna/)
* [Website for CMNA](https://jameshoward.us/cmna/)
* James P. Howard, II <<[email protected]>>

4 changes: 2 additions & 2 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
url: https://howardjp.github.io/cmna/
url: https://jameshoward.us/cmna-pkg
destination: docs

home:
links:
- text: CMNA Page
href: https://jameshoward.us/cmna
- text: The Book
href: https://www.taylorfrancis.com/books/9781315120195
href: https://taylorfrancis.com/books/9781315120195

authors:
James P. Howard, II:
Expand Down
Loading

0 comments on commit 70bd68d

Please sign in to comment.