diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-13 12:27:39 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-13 12:27:39 +0100 |
commit | d2d25c51ad95b4344287917574d4c0506bfaf75d (patch) | |
tree | e516dda0401a5a547be4f96e89b5d96ba95f934a /docs | |
parent | 48c463680b51fa767b4cd7bd62865f192d0354ac (diff) | |
parent | b4582fc7d3f1d395bfd9d870137b705469d9eab2 (diff) |
Merge branch 'master' into saemix
Run make testcheck to regenerate logs with merge conflicts
Diffstat (limited to 'docs')
-rw-r--r-- | docs/404.html | 2 | ||||
-rw-r--r-- | docs/articles/index.html | 2 | ||||
-rw-r--r-- | docs/authors.html | 2 | ||||
-rw-r--r-- | docs/index.html | 2 | ||||
-rw-r--r-- | docs/news/index.html | 12 | ||||
-rw-r--r-- | docs/pkgdown.yml | 2 | ||||
-rw-r--r-- | docs/reference/Rplot001.png | bin | 1011 -> 27554 bytes | |||
-rw-r--r-- | docs/reference/Rplot002.png | bin | 37427 -> 59342 bytes | |||
-rw-r--r-- | docs/reference/endpoints.html | 2 | ||||
-rw-r--r-- | docs/reference/index.html | 2 | ||||
-rw-r--r-- | docs/reference/plot.mixed.mmkin-1.png | bin | 85176 -> 84734 bytes | |||
-rw-r--r-- | docs/reference/plot.mixed.mmkin-2.png | bin | 173876 -> 173916 bytes | |||
-rw-r--r-- | docs/reference/plot.mixed.mmkin.html | 2 |
13 files changed, 18 insertions, 10 deletions
diff --git a/docs/404.html b/docs/404.html index 45a45f3e..f038fb95 100644 --- a/docs/404.html +++ b/docs/404.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="https://pkgdown.jrwb.de/mkin/index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/articles/index.html b/docs/articles/index.html index 66393487..52770090 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/authors.html b/docs/authors.html index 0f68e2ce..e80c3930 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/index.html b/docs/index.html index bcdaa7e4..51571c81 100644 --- a/docs/index.html +++ b/docs/index.html @@ -37,7 +37,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/news/index.html b/docs/news/index.html index 5b24742f..766e6549 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> @@ -141,9 +141,17 @@ <small>Source: <a href='https://github.com/jranke/mkin/blob/master/NEWS.md'><code>NEWS.md</code></a></small> </div> + <div id="mkin-102" class="section level1"> +<h1 class="page-header" data-toc-text="1.0.2"> +<a href="#mkin-102" class="anchor"></a>mkin 1.0.2<small> Unreleased </small> +</h1> +<ul> +<li>‘mkinfit’: Keep model names stored in ‘mkinmod’ objects, avoiding their loss in ‘gmkin’</li> +</ul> +</div> <div id="mkin-101" class="section level1"> <h1 class="page-header" data-toc-text="1.0.1"> -<a href="#mkin-101" class="anchor"></a>mkin 1.0.1<small> Unreleased </small> +<a href="#mkin-101" class="anchor"></a>mkin 1.0.1<small> 2021-02-10 </small> </h1> <ul> <li><p>‘confint.mmkin’, ‘nlme.mmkin’, ‘transform_odeparms’: Fix example code in dontrun sections that failed with current defaults</p></li> diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 4100aea3..f1fe0ec9 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: web_only/NAFTA_examples: NAFTA_examples.html web_only/benchmarks: benchmarks.html web_only/compiled_models: compiled_models.html -last_built: 2021-02-06T08:46Z +last_built: 2021-02-13T05:53Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png Binary files differindex 17a35806..762a3dd4 100644 --- a/docs/reference/Rplot001.png +++ b/docs/reference/Rplot001.png diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png Binary files differindex bb624e64..d24e35b4 100644 --- a/docs/reference/Rplot002.png +++ b/docs/reference/Rplot002.png diff --git a/docs/reference/endpoints.html b/docs/reference/endpoints.html index 9bfbfdc8..e42ca9fe 100644 --- a/docs/reference/endpoints.html +++ b/docs/reference/endpoints.html @@ -78,7 +78,7 @@ advantage that the SFORB model can also be used for metabolites." /> </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.0</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/reference/index.html b/docs/reference/index.html index 0859a152..7b1bc4f1 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png Binary files differindex 9c46481c..9c9a2211 100644 --- a/docs/reference/plot.mixed.mmkin-1.png +++ b/docs/reference/plot.mixed.mmkin-1.png diff --git a/docs/reference/plot.mixed.mmkin-2.png b/docs/reference/plot.mixed.mmkin-2.png Binary files differindex e228f764..0f66ff0f 100644 --- a/docs/reference/plot.mixed.mmkin-2.png +++ b/docs/reference/plot.mixed.mmkin-2.png diff --git a/docs/reference/plot.mixed.mmkin.html b/docs/reference/plot.mixed.mmkin.html index 232d26e7..46303c44 100644 --- a/docs/reference/plot.mixed.mmkin.html +++ b/docs/reference/plot.mixed.mmkin.html @@ -72,7 +72,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.0</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> |