From 49ebe44092d2033f548c901ea406619713583103 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 7 Feb 2020 07:23:06 +0100 Subject: Update Makefile, update FOCUS URL --- GNUmakefile | 2 +- docs/404.html | 145 ++++++++++++++++++++++++++++++++++ docs/articles/gmkin_manual.html | 20 +++-- docs/articles/index.html | 23 ++++-- docs/authors.html | 23 ++++-- docs/index.html | 15 ++-- docs/news/index.html | 23 ++++-- docs/pkgdown.css | 46 ++++++++--- docs/pkgdown.js | 14 ++-- docs/pkgdown.yml | 2 +- docs/reference/FOCUS_2006.html | 43 +++++----- docs/reference/FOCUS_2006_Z.html | 43 +++++----- docs/reference/UBA_model_gallery.html | 38 +++++---- docs/reference/gmkin.html | 34 ++++---- docs/reference/gmkinws.html | 48 ++++++----- docs/reference/index.html | 23 ++++-- man/FOCUS_2006.Rd | 2 +- man/FOCUS_2006_Z.Rd | 2 +- 18 files changed, 395 insertions(+), 151 deletions(-) create mode 100644 docs/404.html diff --git a/GNUmakefile b/GNUmakefile index b2399d7..ffdcdae 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -11,7 +11,7 @@ WINBIN := $(PKGNAME)_$(PKGVERS).zip RBIN ?= $(shell dirname "`which R`") # Specify static documentation directories for subversion on r-forge -RFSVN ?= $(HOME)/svn/kinfit.r-forge +RFSVN ?= $(HOME)/svn/r-forge/kinfit RFDIR ?= $(RFSVN)/pkg/gmkin SDDIR ?= $(RFSVN)/www/gmkin_static diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 0000000..80f880b --- /dev/null +++ b/docs/404.html @@ -0,0 +1,145 @@ + + + + + + + + +Page not found (404) • gmkin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ +
+
+ + +Content not found. Please use links in the navbar. + +
+ +
+ + + +
+ + +
+

Site built with pkgdown 1.4.1.

+
+ +
+
+ + + + + + + + diff --git a/docs/articles/gmkin_manual.html b/docs/articles/gmkin_manual.html index c1e58ec..a562df3 100644 --- a/docs/articles/gmkin_manual.html +++ b/docs/articles/gmkin_manual.html @@ -7,8 +7,9 @@ Manual for gmkin • gmkin - - + + + @@ -38,7 +39,7 @@ +
-

Site built with pkgdown 1.3.0.

+

Site built with pkgdown 1.4.1.

+
+ + diff --git a/docs/reference/gmkinws.html b/docs/reference/gmkinws.html index 4a264e9..7d3b2a0 100644 --- a/docs/reference/gmkinws.html +++ b/docs/reference/gmkinws.html @@ -8,21 +8,25 @@ A workspace class for gmkin — gmkinws • gmkin + + - + + - - + + + @@ -30,13 +34,14 @@ - + + @@ -47,6 +52,7 @@ + @@ -71,7 +77,7 @@ - @@ -104,6 +109,7 @@ +
@@ -115,55 +121,59 @@
-

Datasets, models and fits are stored in lists.

-
gmkinws
- + +

Format

An R6Class generator object.

-

Fields

-
+ +
observed

Names of the observed variables in the datasets, named by the names used in the models contained in field m

-
ds

A list of datasets compatible with mkinfit (long format)

-
m

A list of mkinmod models

-
f

A list of mkinfit objects

+ +
ds

A list of datasets compatible with mkinfit (long format)

+ +
m

A list of mkinmod models

+ +
f

A list of mkinfit objects

+
- +
-

Site built with pkgdown 1.3.0.

+

Site built with pkgdown 1.4.1.

+
+ + diff --git a/docs/reference/index.html b/docs/reference/index.html index 96635b9..c96681b 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -8,21 +8,25 @@ Function reference • gmkin + + - + + - - + + + @@ -30,10 +34,12 @@ + + @@ -44,6 +50,7 @@ + @@ -68,7 +75,7 @@ - @@ -101,6 +107,7 @@ +
@@ -167,19 +174,23 @@
+ + + diff --git a/man/FOCUS_2006.Rd b/man/FOCUS_2006.Rd index 56bccac..c51e884 100644 --- a/man/FOCUS_2006.Rd +++ b/man/FOCUS_2006.Rd @@ -26,6 +26,6 @@ Degradation Kinetics from Environmental Fate Studies on Pesticides in EU Registration} Report of the FOCUS Work Group on Degradation Kinetics, EC Document Reference Sanco/10058/2005 version 2.0, 434 pp, - \url{http://focus.jrc.ec.europa.eu/dk} + \url{http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics} } \keyword{datasets} diff --git a/man/FOCUS_2006_Z.Rd b/man/FOCUS_2006_Z.Rd index ac7098c..5df8a3f 100644 --- a/man/FOCUS_2006_Z.Rd +++ b/man/FOCUS_2006_Z.Rd @@ -23,6 +23,6 @@ Degradation Kinetics from Environmental Fate Studies on Pesticides in EU Registration} Report of the FOCUS Work Group on Degradation Kinetics, EC Document Reference Sanco/10058/2005 version 2.0, 434 pp, - \url{http://focus.jrc.ec.europa.eu/dk} + \url{http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics} } \keyword{datasets} -- cgit v1.2.1