From 17ef63f22008c80998cb2690a40ad1238d06a400 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 8 Oct 2015 07:50:36 +0200 Subject: Fix NAMESPACE, update static docs, simplify Makefile --- .Rbuildignore | 1 + .gitignore | 2 ++ DESCRIPTION | 9 ++++----- GNUmakefile | 25 ++++++++++--------------- NAMESPACE | 3 +++ inst/web/calplot.lm.html | 4 ++-- inst/web/chemCal-package.html | 4 ++-- inst/web/din32645.html | 8 ++++---- inst/web/index.html | 8 ++++---- inst/web/inverse.predict.html | 4 ++-- inst/web/lod.html | 4 ++-- inst/web/loq.html | 4 ++-- inst/web/massart97ex1.html | 4 ++-- inst/web/massart97ex3.html | 4 ++-- inst/web/vignettes/chemCal.pdf | Bin 165707 -> 165905 bytes vignettes/chemCal.pdf | Bin 165707 -> 165905 bytes 16 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 .gitignore diff --git a/.Rbuildignore b/.Rbuildignore index 0b413f5..536ef7d 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -7,3 +7,4 @@ aux$ log$ vignettes/chemCal.tex vignettes/chemCal.pdf +chemCal_.*.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a59322 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +chemCal.Rcheck +chemCal_*.tar.gz diff --git a/DESCRIPTION b/DESCRIPTION index e6e6384..33a64a4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: chemCal -Version: 0.1-36 -Date: 2015-10-07 +Version: 0.1-37 +Date: 2015-10-08 Title: Calibration Functions for Analytical Chemistry Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de")) @@ -13,6 +13,5 @@ Description: Simple functions for plotting linear The functions work on model objects from - optionally weighted - linear regression (lm) or robust linear regression ('rlm' from the 'MASS' package). License: GPL (>= 2) -URL: http://www.r-project.org, - http://www.uft.uni-bremen.de/chemie/ranke, - http://kriemhild.uft.uni-bremen.de/viewcvs/?root=chemCal +URL: http://www.r-project.org, + http://chem.uft.uni-bremen.de/ranke/?page=chemCal, http://cgit.jrwb.de/chemCal diff --git a/GNUmakefile b/GNUmakefile index c0d78e3..140f7e3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,7 +1,7 @@ PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) PKGSRC := $(shell basename $(PWD)) -TGZ := ../$(PKGNAME)_$(PKGVERS).tar.gz +TGZ := $(PKGNAME)_$(PKGVERS).tar.gz # Specify the directory holding R binaries. To use an alternate R build (say a # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...` @@ -19,10 +19,11 @@ help: @echo "-----------------" @echo " build Create the package" @echo " build-no-vignettes Create the package without rebuilding vignettes" - @echo " check Invoke build and then check the package" - @echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check" @echo " install Invoke build and then install the result" @echo " install-no-vignettes Invoke build without rebuilding vignettes and then install the result" + @echo " check Invoke build and then check the package" + @echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check" + @echo " sd Build static documentation" @echo " winbuilder Upload the build to winbuilder" @echo "" @echo "Using R in: $(RBIN)" @@ -35,28 +36,22 @@ help: #------------------------------------------------------------------------------ build: - cd ..;\ - "$(RBIN)/R" CMD build $(PKGSRC) + "$(RBIN)/R" CMD build . build-no-vignettes: - cd ..;\ - "$(RBIN)/R" CMD build $(PKGSRC) --no-build-vignettes + "$(RBIN)/R" CMD build --no-build-vignettes . install: build - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(TGZ) + "$(RBIN)/R" CMD INSTALL $(TGZ) install-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD INSTALL $(TGZ) + "$(RBIN)/R" CMD INSTALL $(TGZ) check: build - cd ..;\ - "$(RBIN)/R" CMD check --as-cran $(TGZ) + "$(RBIN)/R" CMD check --as-cran $(TGZ) check-no-vignettes: build-no-vignettes - cd ..;\ - "$(RBIN)/R" CMD check --as-cran $(TGZ) + "$(RBIN)/R" CMD check --as-cran $(TGZ) sd: @echo Now execute diff --git a/NAMESPACE b/NAMESPACE index 7daafff..7ca061a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -9,3 +9,6 @@ S3method(loq, lm) S3method(inverse.predict, default) S3method(inverse.predict, lm) S3method(inverse.predict, rlm) + +importFrom("graphics", "legend", "matlines", "plot", "points") +importFrom("stats", "optimize", "predict", "qt") diff --git a/inst/web/calplot.lm.html b/inst/web/calplot.lm.html index d463ffe..a8d3f4b 100644 --- a/inst/web/calplot.lm.html +++ b/inst/web/calplot.lm.html @@ -2,7 +2,7 @@ -calplot. chemCal 0.1-35.900 +calplot. chemCal 0.1-37
- chemCal 0.1-35.900 + chemCal 0.1-37
  • Index
    • diff --git a/inst/web/chemCal-package.html b/inst/web/chemCal-package.html index 823b7dc..def6014 100644 --- a/inst/web/chemCal-package.html +++ b/inst/web/chemCal-package.html @@ -2,7 +2,7 @@ -chemCal-package. chemCal 0.1-35.900 +chemCal-package. chemCal 0.1-37
    - chemCal 0.1-35.900 + chemCal 0.1-37
    • Index
      • diff --git a/inst/web/din32645.html b/inst/web/din32645.html index 115d250..7d42e8f 100644 --- a/inst/web/din32645.html +++ b/inst/web/din32645.html @@ -2,7 +2,7 @@ -din32645. chemCal 0.1-35.900 +din32645. chemCal 0.1-37 @@ -32,7 +32,7 @@
      - chemCal 0.1-35.900 + chemCal 0.1-37
      • Index
        • @@ -74,8 +74,8 @@

        DIN 32645 (equivalent to ISO 11843), Beuth Verlag, Berlin, 1994

        Dintest. Plugin for MS Excel for evaluations of calibration data. Written - by Georg Schmitt, University of Heidelberg. - http://www.rzuser.uni-heidelberg.de/~df6/download/dintest.htm

        + by Georg Schmitt, University of Heidelberg. Formerly available from + the Website of the University of Heidelberg.

        Currie, L. A. (1997) Nomenclature in evaluation of analytical methods including detection and quantification capabilities (IUPAC Recommendations 1995). diff --git a/inst/web/index.html b/inst/web/index.html index 39c6b74..501c0d4 100644 --- a/inst/web/index.html +++ b/inst/web/index.html @@ -2,7 +2,7 @@ -Index. chemCal 0.1-35.900 +Index. chemCal 0.1-37 @@ -32,7 +32,7 @@

        - chemCal 0.1-35.900 + chemCal 0.1-37
        • Index
          • @@ -49,13 +49,13 @@
          - chemCal provides simple functions for plotting linear + Simple functions for plotting linear calibration functions and estimating standard errors for measurements according to the Handbook of Chemometrics and Qualimetrics: Part A by Massart et al. There are also functions estimating the limit of detection (LOD) and limit of quantification (LOQ). The functions work on model objects from - optionally weighted - linear -regression (lm) or robust linear regression (rlm from the MASS package). +regression (lm) or robust linear regression ('rlm' from the 'MASS' package).

          Help topics

          diff --git a/inst/web/inverse.predict.html b/inst/web/inverse.predict.html index 855ee6a..a513357 100644 --- a/inst/web/inverse.predict.html +++ b/inst/web/inverse.predict.html @@ -2,7 +2,7 @@ -inverse.predict. chemCal 0.1-35.900 +inverse.predict. chemCal 0.1-37 @@ -32,7 +32,7 @@
          - chemCal 0.1-35.900 + chemCal 0.1-37
          • Index
            • diff --git a/inst/web/lod.html b/inst/web/lod.html index e679821..966ce1a 100644 --- a/inst/web/lod.html +++ b/inst/web/lod.html @@ -2,7 +2,7 @@ -lod. chemCal 0.1-35.900 +lod. chemCal 0.1-37 @@ -32,7 +32,7 @@
            - chemCal 0.1-35.900 + chemCal 0.1-37
            • Index
              • diff --git a/inst/web/loq.html b/inst/web/loq.html index dd03523..f628808 100644 --- a/inst/web/loq.html +++ b/inst/web/loq.html @@ -2,7 +2,7 @@ -loq. chemCal 0.1-35.900 +loq. chemCal 0.1-37 @@ -32,7 +32,7 @@
              - chemCal 0.1-35.900 + chemCal 0.1-37
              • Index
                • diff --git a/inst/web/massart97ex1.html b/inst/web/massart97ex1.html index d64dbe3..1e1a0cd 100644 --- a/inst/web/massart97ex1.html +++ b/inst/web/massart97ex1.html @@ -2,7 +2,7 @@ -massart97ex1. chemCal 0.1-35.900 +massart97ex1. chemCal 0.1-37 @@ -32,7 +32,7 @@
                - chemCal 0.1-35.900 + chemCal 0.1-37
                • Index
                  • diff --git a/inst/web/massart97ex3.html b/inst/web/massart97ex3.html index 9f94ed8..45c0999 100644 --- a/inst/web/massart97ex3.html +++ b/inst/web/massart97ex3.html @@ -2,7 +2,7 @@ -massart97ex3. chemCal 0.1-35.900 +massart97ex3. chemCal 0.1-37 @@ -32,7 +32,7 @@
                  - chemCal 0.1-35.900 + chemCal 0.1-37
                  • Index
                    • diff --git a/inst/web/vignettes/chemCal.pdf b/inst/web/vignettes/chemCal.pdf index 90934e8..b216931 100644 Binary files a/inst/web/vignettes/chemCal.pdf and b/inst/web/vignettes/chemCal.pdf differ diff --git a/vignettes/chemCal.pdf b/vignettes/chemCal.pdf index 90934e8..b216931 100644 Binary files a/vignettes/chemCal.pdf and b/vignettes/chemCal.pdf differ -- cgit v1.2.1