From e7f7cfdeb40b836a2b4eb23ee93c57b4e6abb8f1 Mon Sep 17 00:00:00 2001 From: Johannes Ranke <johannes.ranke@jrwb.de> Date: Wed, 29 Jan 2025 19:08:30 +0100 Subject: Add NEWs entry and update docs --- docs/reference/PEC_soil.html | 2 +- docs/reference/PEC_sw_drainage_UK.html | 2 +- docs/reference/PEC_sw_exposit_drainage.html | 6 +-- docs/reference/index.html | 2 +- docs/reference/plot.one_box-1.png | Bin 24259 -> 24674 bytes docs/reference/plot.one_box-2.png | Bin 29965 -> 28126 bytes docs/reference/plot.one_box-3.png | Bin 41819 -> 27426 bytes docs/reference/plot.one_box-4.png | Bin 0 -> 36815 bytes docs/reference/plot.one_box-5.png | Bin 0 -> 35949 bytes docs/reference/plot.one_box.html | 76 +++++++++++++--------------- 10 files changed, 42 insertions(+), 46 deletions(-) create mode 100644 docs/reference/plot.one_box-4.png create mode 100644 docs/reference/plot.one_box-5.png (limited to 'docs/reference') diff --git a/docs/reference/PEC_soil.html b/docs/reference/PEC_soil.html index e214173..3c36cfa 100644 --- a/docs/reference/PEC_soil.html +++ b/docs/reference/PEC_soil.html @@ -306,7 +306,7 @@ doi:10.2903/j.efsa.2015.4093</p> </div> <div class="pkgdown-footer-right"> - <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.0.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.1.</p> </div> </footer></div> diff --git a/docs/reference/PEC_sw_drainage_UK.html b/docs/reference/PEC_sw_drainage_UK.html index 8c4c56d..8505b9b 100644 --- a/docs/reference/PEC_sw_drainage_UK.html +++ b/docs/reference/PEC_sw_drainage_UK.html @@ -123,7 +123,7 @@ accessed 2019-09-27</p> </div> <div class="pkgdown-footer-right"> - <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.0.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.1.</p> </div> </footer></div> diff --git a/docs/reference/PEC_sw_exposit_drainage.html b/docs/reference/PEC_sw_exposit_drainage.html index 7229923..3cd1f6f 100644 --- a/docs/reference/PEC_sw_exposit_drainage.html +++ b/docs/reference/PEC_sw_exposit_drainage.html @@ -23,7 +23,7 @@ V_ditch and V_drainage using units::units from the units package.'></head><body> <a class="navbar-brand me-2" href="../index.html">pfm</a> - <small class="nav-text text-muted me-auto" data-bs-toggle="tooltip" data-bs-placement="bottom" title="">0.6.3</small> + <small class="nav-text text-muted me-auto" data-bs-toggle="tooltip" data-bs-placement="bottom" title="">0.6.4</small> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"> @@ -58,7 +58,7 @@ with modest to high mobility (groups 2, 3 and 4). In this implementation, the group is derived only from the Koc, if not given explicitly. For details, see the discussion of the function arguments below. It is recommened to specify the arguments <code>rate</code>, <code>Koc</code>, <code>DT50</code>, <code>t_drainage</code>, -<code>V_ditch</code> and <code>V_drainage</code> using <a href="https://rdrr.io/pkg/units/man/units.html" class="external-link">units::units</a> from the <code>units</code> package.</p> +<code>V_ditch</code> and <code>V_drainage</code> using <a href="https://r-quantities.github.io/units/reference/units.html" class="external-link">units::units</a> from the <code>units</code> package.</p> </div> <div class="section level2"> @@ -169,7 +169,7 @@ scenarios. If the rate was given in g/ha, the PECsw are in microg/L.</p></dd> </div> <div class="pkgdown-footer-right"> - <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.0.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.1.</p> </div> </footer></div> diff --git a/docs/reference/index.html b/docs/reference/index.html index f91e880..a4dc599 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -352,7 +352,7 @@ </div> <div class="pkgdown-footer-right"> - <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.0.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.1.</p> </div> </footer></div> diff --git a/docs/reference/plot.one_box-1.png b/docs/reference/plot.one_box-1.png index 066f466..5149343 100644 Binary files a/docs/reference/plot.one_box-1.png and b/docs/reference/plot.one_box-1.png differ diff --git a/docs/reference/plot.one_box-2.png b/docs/reference/plot.one_box-2.png index 307dc3c..e6ea438 100644 Binary files a/docs/reference/plot.one_box-2.png and b/docs/reference/plot.one_box-2.png differ diff --git a/docs/reference/plot.one_box-3.png b/docs/reference/plot.one_box-3.png index cea8b0b..33a9f43 100644 Binary files a/docs/reference/plot.one_box-3.png and b/docs/reference/plot.one_box-3.png differ diff --git a/docs/reference/plot.one_box-4.png b/docs/reference/plot.one_box-4.png new file mode 100644 index 0000000..3a4e7a2 Binary files /dev/null and b/docs/reference/plot.one_box-4.png differ diff --git a/docs/reference/plot.one_box-5.png b/docs/reference/plot.one_box-5.png new file mode 100644 index 0000000..77e8eed Binary files /dev/null and b/docs/reference/plot.one_box-5.png differ diff --git a/docs/reference/plot.one_box.html b/docs/reference/plot.one_box.html index 4401d50..a328288 100644 --- a/docs/reference/plot.one_box.html +++ b/docs/reference/plot.one_box.html @@ -1,43 +1,34 @@ <!DOCTYPE html> -<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><meta name="description" content="Plot time series of decline data"><title>Plot time series of decline data — plot.one_box • pfm</title><script src="../deps/jquery-3.6.0/jquery-3.6.0.min.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><link href="../deps/bootstrap-5.3.1/bootstrap.min.css" rel="stylesheet"><script src="../deps/bootstrap-5.3.1/bootstrap.bundle.min.js"></script><!-- Font Awesome icons --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/v4-shims.min.css" integrity="sha256-wZjR52fzng1pJHwx4aV2AO3yyTOXrcDW7jBpJtTwVxw=" crossorigin="anonymous"><!-- bootstrap-toc --><script src="https://cdn.jsdelivr.net/gh/afeld/bootstrap-toc@v1.0.1/dist/bootstrap-toc.min.js" integrity="sha256-4veVQbu7//Lk5TSmc7YV48MxtMy98e26cf5MrgZYnwo=" crossorigin="anonymous"></script><!-- headroom.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/headroom.min.js" integrity="sha256-AsUX4SJE1+yuDu5+mAVzJbuYNPHj/WroHuZ8Ir/CkE0=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/jQuery.headroom.min.js" integrity="sha256-ZX/yNShbjqsohH1k95liqY9Gd8uOiE1S4vZc+9KQ1K4=" crossorigin="anonymous"></script><!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script><!-- search --><script src="https://cdnjs.cloudflare.com/ajax/libs/fuse.js/6.4.6/fuse.js" integrity="sha512-zv6Ywkjyktsohkbp9bb45V6tEMoWhzFzXis+LrMehmJZZSys19Yxf1dopHx7WzIKxr5tK2dVcYmaCk2uqdjF4A==" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/autocomplete.js/0.38.0/autocomplete.jquery.min.js" integrity="sha512-GU9ayf+66Xx2TmpxqJpliWbT5PiGYxpaG8rfnBEk1LL8l1KGkRShhngwdXK1UgqhAzWpZHSiYPc09/NwDQIGyg==" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/mark.min.js" integrity="sha512-5CYOlHXGh6QpOFA/TeTylKLWfB3ftPsde7AnmhuitiTX4K5SqCLBeKro6sPS8ilsz1Q4NRx3v8Ko2IBiszzdww==" crossorigin="anonymous"></script><!-- pkgdown --><script src="../pkgdown.js"></script><meta property="og:title" content="Plot time series of decline data — plot.one_box"><meta property="og:description" content="Plot time series of decline data"><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script><!--[if lt IE 9]> -<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> -<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> -<![endif]--></head><body> +<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><title>Plot time series of decline data — plot.one_box • pfm</title><script src="../deps/jquery-3.6.0/jquery-3.6.0.min.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><link href="../deps/bootstrap-5.3.1/bootstrap.min.css" rel="stylesheet"><script src="../deps/bootstrap-5.3.1/bootstrap.bundle.min.js"></script><!-- pkgdown --><script src="../pkgdown.js"></script><meta property="og:title" content="Plot time series of decline data — plot.one_box"><meta name="description" content="Plot time series of decline data"><meta property="og:description" content="Plot time series of decline data"></head><body> <a href="#main" class="visually-hidden-focusable">Skip to contents</a> - - <nav class="navbar fixed-top navbar-light navbar-expand-lg bg-light"><div class="container"> - + + <nav class="navbar navbar-expand-lg fixed-top bg-light" data-bs-theme="light" aria-label="Site navigation"><div class="container"> + <a class="navbar-brand me-2" href="../index.html">pfm</a> - <small class="nav-text text-muted me-auto" data-bs-toggle="tooltip" data-bs-placement="bottom" title="">0.6.1</small> + <small class="nav-text text-muted me-auto" data-bs-toggle="tooltip" data-bs-placement="bottom" title="">0.6.4</small> + - <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> <div id="navbar" class="collapse navbar-collapse ms-3"> - <ul class="navbar-nav me-auto"><li class="active nav-item"> - <a class="nav-link" href="../reference/index.html">Reference</a> -</li> - </ul><form class="form-inline my-2 my-lg-0" role="search"> - <input type="search" class="form-control me-sm-2" aria-label="Toggle navigation" name="search-input" data-search-index="../search.json" id="search-input" placeholder="Search for" autocomplete="off"></form> - - <ul class="navbar-nav"><li class="nav-item"> - <a class="external-link nav-link" href="https://github.com/jranke/pfm/" aria-label="github"> - <span class="fab fa fab fa-github fa-lg"></span> - - </a> -</li> + <ul class="navbar-nav me-auto"><li class="active nav-item"><a class="nav-link" href="../reference/index.html">Reference</a></li> +<li class="nav-item"><a class="nav-link" href="../news/index.html">Changelog</a></li> + </ul><ul class="navbar-nav"><li class="nav-item"><form class="form-inline" role="search"> + <input class="form-control" type="search" name="search-input" id="search-input" autocomplete="off" aria-label="Search site" placeholder="Search for" data-search-index="../search.json"></form></li> +<li class="nav-item"><a class="external-link nav-link" href="https://github.com/jranke/pfm/" aria-label="GitHub"><span class="fa fab fa-github fa-lg"></span></a></li> </ul></div> - + </div> </nav><div class="container template-reference-topic"> <div class="row"> <main id="main" class="col-md-9"><div class="page-header"> - <img src="" class="logo" alt=""><h1>Plot time series of decline data</h1> + + <h1>Plot time series of decline data</h1> <small class="dont-index">Source: <a href="https://github.com/jranke/pfm/blob/HEAD/R/twa.R" class="external-link"><code>R/twa.R</code></a></small> <div class="d-none name"><code>plot.one_box.Rd</code></div> </div> @@ -48,7 +39,7 @@ <div class="section level2"> <h2 id="ref-usage">Usage<a class="anchor" aria-label="anchor" href="#ref-usage"></a></h2> - <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="co"># S3 method for one_box</span></span> + <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="co"># S3 method for class 'one_box'</span></span> <span><span class="fu"><a href="https://rdrr.io/r/graphics/plot.default.html" class="external-link">plot</a></span><span class="op">(</span></span> <span> <span class="va">x</span>,</span> <span> xlim <span class="op">=</span> <span class="fu"><a href="https://rdrr.io/r/base/range.html" class="external-link">range</a></span><span class="op">(</span><span class="fu"><a href="https://rdrr.io/r/stats/time.html" class="external-link">time</a></span><span class="op">(</span><span class="va">x</span><span class="op">)</span><span class="op">)</span>,</span> @@ -63,37 +54,39 @@ <div class="section level2"> <h2 id="arguments">Arguments<a class="anchor" aria-label="anchor" href="#arguments"></a></h2> - <dl><dt>x</dt> + + +<dl><dt id="arg-x">x<a class="anchor" aria-label="anchor" href="#arg-x"></a></dt> <dd><p>The object of type <code><a href="one_box.html">one_box</a></code> to be plotted</p></dd> -<dt>xlim</dt> +<dt id="arg-xlim">xlim<a class="anchor" aria-label="anchor" href="#arg-xlim"></a></dt> <dd><p>Limits for the x axis</p></dd> -<dt>ylim</dt> +<dt id="arg-ylim">ylim<a class="anchor" aria-label="anchor" href="#arg-ylim"></a></dt> <dd><p>Limits for the y axis</p></dd> -<dt>xlab</dt> +<dt id="arg-xlab">xlab<a class="anchor" aria-label="anchor" href="#arg-xlab"></a></dt> <dd><p>Label for the x axis</p></dd> -<dt>ylab</dt> +<dt id="arg-ylab">ylab<a class="anchor" aria-label="anchor" href="#arg-ylab"></a></dt> <dd><p>Label for the y axis</p></dd> -<dt>max_twa</dt> +<dt id="arg-max-twa">max_twa<a class="anchor" aria-label="anchor" href="#arg-max-twa"></a></dt> <dd><p>If a numeric value is given, the maximum time weighted average concentration(s) is/are shown in the graph.</p></dd> -<dt>max_twa_var</dt> +<dt id="arg-max-twa-var">max_twa_var<a class="anchor" aria-label="anchor" href="#arg-max-twa-var"></a></dt> <dd><p>Variable for which the maximum time weighted average should be shown if max_twa is not NULL.</p></dd> -<dt>...</dt> +<dt id="arg--">...<a class="anchor" aria-label="anchor" href="#arg--"></a></dt> <dd><p>Further arguments passed to methods</p></dd> </dl></div> @@ -109,35 +102,38 @@ be shown if max_twa is not NULL.</p></dd> <span class="r-plt img"><img src="plot.one_box-1.png" alt="" width="700" height="433"></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/graphics/plot.default.html" class="external-link">plot</a></span><span class="op">(</span><span class="fu"><a href="sawtooth.html">sawtooth</a></span><span class="op">(</span><span class="va">dfop_pred</span>, <span class="fl">3</span>, <span class="fl">7</span><span class="op">)</span>, max_twa <span class="op">=</span> <span class="fl">21</span><span class="op">)</span></span></span> <span class="r-plt img"><img src="plot.one_box-2.png" alt="" width="700" height="433"></span> +<span class="r-plt img"><img src="plot.one_box-3.png" alt="" width="700" height="433"></span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># Use a fitted mkinfit model</span></span></span> -<span class="r-in"><span><span class="va">m_2</span> <span class="op"><-</span> <span class="fu"><a href="https://pkgdown.jrwb.de/mkin/reference/mkinmod.html" class="external-link">mkinmod</a></span><span class="op">(</span>parent <span class="op">=</span> <span class="fu"><a href="https://pkgdown.jrwb.de/mkin/reference/mkinmod.html" class="external-link">mkinsub</a></span><span class="op">(</span><span class="st">"SFO"</span>, <span class="st">"m1"</span><span class="op">)</span>, m1 <span class="op">=</span> <span class="fu"><a href="https://pkgdown.jrwb.de/mkin/reference/mkinmod.html" class="external-link">mkinsub</a></span><span class="op">(</span><span class="st">"SFO"</span><span class="op">)</span><span class="op">)</span></span></span> +<span class="r-in"><span><span class="va">m_2</span> <span class="op"><-</span> <span class="fu">mkinmod</span><span class="op">(</span>parent <span class="op">=</span> <span class="fu">mkinsub</span><span class="op">(</span><span class="st">"SFO"</span>, <span class="st">"m1"</span><span class="op">)</span>, m1 <span class="op">=</span> <span class="fu">mkinsub</span><span class="op">(</span><span class="st">"SFO"</span><span class="op">)</span><span class="op">)</span></span></span> <span class="r-msg co"><span class="r-pr">#></span> Temporary DLL for differentials generated and loaded</span> -<span class="r-in"><span><span class="va">fit_2</span> <span class="op"><-</span> <span class="fu"><a href="https://pkgdown.jrwb.de/mkin/reference/mkinfit.html" class="external-link">mkinfit</a></span><span class="op">(</span><span class="va">m_2</span>, <span class="va">FOCUS_2006_D</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> +<span class="r-in"><span><span class="va">fit_2</span> <span class="op"><-</span> <span class="fu">mkinfit</span><span class="op">(</span><span class="va">m_2</span>, <span class="va">FOCUS_2006_D</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> <span class="r-wrn co"><span class="r-pr">#></span> <span class="warning">Warning: </span>Observations with value of zero were removed from the data</span> <span class="r-in"><span><span class="va">pred_2</span> <span class="op"><-</span> <span class="fu"><a href="one_box.html">one_box</a></span><span class="op">(</span><span class="va">fit_2</span>, ini <span class="op">=</span> <span class="fl">1</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="va">pred_2_saw</span> <span class="op"><-</span> <span class="fu"><a href="sawtooth.html">sawtooth</a></span><span class="op">(</span><span class="va">pred_2</span>, <span class="fl">2</span>, <span class="fl">7</span><span class="op">)</span></span></span> +<span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/graphics/plot.default.html" class="external-link">plot</a></span><span class="op">(</span><span class="va">pred_2_saw</span><span class="op">)</span></span></span> <span class="r-in"><span><span class="fu"><a href="https://rdrr.io/r/graphics/plot.default.html" class="external-link">plot</a></span><span class="op">(</span><span class="va">pred_2_saw</span>, max_twa <span class="op">=</span> <span class="fl">21</span>, max_twa_var <span class="op">=</span> <span class="st">"m1"</span><span class="op">)</span></span></span> -<span class="r-plt img"><img src="plot.one_box-3.png" alt="" width="700" height="433"></span> +<span class="r-plt img"><img src="plot.one_box-4.png" alt="" width="700" height="433"></span> +<span class="r-plt img"><img src="plot.one_box-5.png" alt="" width="700" height="433"></span> </code></pre></div> </div> - </main><aside class="col-md-3"><nav id="toc"><h2>On this page</h2> + </main><aside class="col-md-3"><nav id="toc" aria-label="Table of contents"><h2>On this page</h2> </nav></aside></div> <footer><div class="pkgdown-footer-left"> - <p></p><p>Developed by Johannes Ranke.</p> + <p>Developed by Johannes Ranke.</p> </div> <div class="pkgdown-footer-right"> - <p></p><p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.7.</p> + <p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.1.1.</p> </div> </footer></div> - - + + </body></html> -- cgit v1.2.1