aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md14
-rw-r--r--docs/index.html6
-rw-r--r--docs/reference/PELMO_runs.html2
-rw-r--r--docs/reference/pesticide.txt2
4 files changed, 19 insertions, 5 deletions
diff --git a/README.md b/README.md
index b4b2caa..68874f2 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,18 @@ This means:
## Installation
-You can install the package from [github](http://github.com/jranke/pfm), e.g.
+The easiest way to install the package is probably to use
+[drat](http://cran.r-project.org/package=drat):
+
+```r
+install.packages("drat")
+drat::addRepo("jranke")
+install.packages("pfm")
+```
+
+Alternatively you can install the package
using the `devtools` package. Using `quick = TRUE` skips docs,
-multiple-architecture builds, demos, and vignettes, to make installation as
-fast and painless as possible.
+multiple-architecture builds, demos, and vignettes.
```r
diff --git a/docs/index.html b/docs/index.html
index fc6e0f8..b7f32cc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -84,7 +84,11 @@ this program. If not, see <span class="op">&lt;</span>http<span class="op">:</sp
<div id="installation" class="section level2">
<h2 class="hasAnchor">
<a href="#installation" class="anchor"></a>Installation</h2>
-<p>You can install the package from <a href="http://github.com/jranke/pfm">github</a>, e.g. using the <code>devtools</code> package. Using <code>quick = TRUE</code> skips docs, multiple-architecture builds, demos, and vignettes, to make installation as fast and painless as possible.</p>
+<p>The easiest way to install the package is probably to use <a href="http://cran.r-project.org/package=drat">drat</a>:</p>
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">install.packages</span>(<span class="st">"drat"</span>)
+drat<span class="op">::</span><span class="kw"><a href="http://www.rdocumentation.org/packages/drat/topics/addRepo">addRepo</a></span>(<span class="st">"jranke"</span>)
+<span class="kw">install.packages</span>(<span class="st">"pfm"</span>)</code></pre></div>
+<p>Alternatively you can install the package using the <code>devtools</code> package. Using <code>quick = TRUE</code> skips docs, multiple-architecture builds, demos, and vignettes.</p>
<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">library</span>(devtools)
<span class="kw"><a href="http://www.rdocumentation.org/packages/devtools/topics/install_github">install_github</a></span>(<span class="st">"jranke/pfm"</span>, <span class="dt">quick =</span> <span class="ot">TRUE</span>)</code></pre></div>
</div>
diff --git a/docs/reference/PELMO_runs.html b/docs/reference/PELMO_runs.html
index 72e3c39..1eac49b 100644
--- a/docs/reference/PELMO_runs.html
+++ b/docs/reference/PELMO_runs.html
@@ -229,7 +229,7 @@ the period.plm file generated by the FOCUS PELMO GUI.</p>
#&gt;
#&gt; </div><div class='input'><span class='co'># We get exactly the same PECgw values (on Linux, calling PELMO using Wine).</span>
<span class='fu'>print</span>(<span class='no'>time_1</span>)</div><div class='output co'>#&gt; User System verstrichen
-#&gt; 0.390 0.084 30.914 </div><div class='input'><span class='kw'>if</span>(!<span class='fu'>inherits</span>(<span class='fu'>try</span>(<span class='no'>cpuinfo</span> <span class='kw'>&lt;-</span> <span class='fu'>readLines</span>(<span class='st'>"/proc/cpuinfo"</span>)), <span class='st'>"try-error"</span>)) {
+#&gt; 0.398 0.100 30.624 </div><div class='input'><span class='kw'>if</span>(!<span class='fu'>inherits</span>(<span class='fu'>try</span>(<span class='no'>cpuinfo</span> <span class='kw'>&lt;-</span> <span class='fu'>readLines</span>(<span class='st'>"/proc/cpuinfo"</span>)), <span class='st'>"try-error"</span>)) {
<span class='fu'>cat</span>(<span class='fu'>gsub</span>(<span class='st'>"model name\t: "</span>, <span class='st'>"CPU model: "</span>, <span class='no'>cpuinfo</span>[<span class='fu'>grep</span>(<span class='st'>"model name"</span>, <span class='no'>cpuinfo</span>)[<span class='fl'>1</span>]]))
}</div><div class='output co'>#&gt; CPU model: AMD Ryzen 7 1700 Eight-Core Processor</div><div class='input'>
<span class='co'># Demonstrate some results with metabolites.</span>
diff --git a/docs/reference/pesticide.txt b/docs/reference/pesticide.txt
index 0f03e9a..85f103d 100644
--- a/docs/reference/pesticide.txt
+++ b/docs/reference/pesticide.txt
@@ -33,3 +33,5 @@ Dummy 1 cereals, spring n NA Dummy 1 cereals, winter s of Dummy 1 citrus n mm Du
M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js 250.00 100.00 100.00 50.00 100.00 100.00 0.00E+00 50.00 1000.00 1.00 0.00E+00 1.00 -99.00 -99.00 -99.00 -99.00 0.00E+00 1.00
Dummy 1 cereals, spring n NA Dummy 1 cereals, winter s of Dummy 1 citrus n mm Dummy 1 cotton s js Dummy 1 field beans n NA Dummy 1 grass / alfalfa s of Dummy 1 hops n mm Dummy 1 legumes s js Dummy 1 maize n NA Dummy 1 oil seed rape, spring s of Dummy 1 oil seed rape, winter n mm Dummy 1 olives s js Dummy 1 pome / stone fruit, early applns n NA Dummy 1 pome / stone fruit, late applns s of Dummy 1 potatoes n mm Dummy 1 soybeans s js Dummy 1 sugar beets n NA Dummy 1 sunflowers s of Dummy 1 tobacco n mm Dummy 1 vegetables, bulb s js Dummy 1 vegetables, fruiting n NA Dummy 1 vegetables, leafy s of Dummy 1 vegetables, root n mm Dummy 1 vines, early applns s js Dummy 1 vines, late applns n NA Dummy 1 appln, aerial s of Dummy 1 appln, hand (crop < 50 cm) n mm Dummy 1 appln, hand (crop > 50 cm) s js Dummy 1 no drift (incorp or seed trtmt) n NA Dummy 1 cereals, spring n NA Dummy 1 cereals, winter s of Dummy 1 citrus n mm Dummy 1 cotton s js Dummy 1 field beans n NA Dummy 1 grass / alfalfa s of Dummy 1 hops n mm Dummy 1 legumes s js Dummy 1 maize n NA Dummy 1 oil seed rape, spring s of Dummy 1 oil seed rape, winter n mm Dummy 1 olives s js Dummy 1 pome / stone fruit, early applns n NA Dummy 1 pome / stone fruit, late applns s of Dummy 1 potatoes n mm Dummy 1 soybeans s js Dummy 1 sugar beets n NA Dummy 1 sunflowers s of Dummy 1 tobacco n mm Dummy 1 vegetables, bulb s js Dummy 1 vegetables, fruiting n NA Dummy 1 vegetables, leafy s of Dummy 1 vegetables, root n mm Dummy 1 vines, early applns s js Dummy 1 vines, late applns n NA Dummy 1 appln, aerial s of Dummy 1 appln, hand (crop < 50 cm) n mm Dummy 1 appln, hand (crop > 50 cm) s js Dummy 1 no drift (incorp or seed trtmt) n NA -99.00 -99.00 6000.00 344.80 0.00E+00 6.00 0.00E+00 0.00E+00 3000.00 1.00 0.00E+00 0.00E+00 1.00 2.00 3.00 4.00 5.00 6.00 7.00 8.00 9.00 10.00 11.00 12.00 13.00 14.00 15.00 16.00 17.00 18.00 19.00 20.00 21.00 22.00 23.00 24.00 25.00 26.00 27.00 28.00 0.00E+00 -99.00 -99.00 -99.00 0.00E+00 1.00
M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js 250.00 100.00 100.00 50.00 100.00 100.00 0.00E+00 50.00 1000.00 1.00 0.00E+00 1.00 -99.00 -99.00 -99.00 -99.00 0.00E+00 1.00
+Dummy 1 cereals, spring n NA Dummy 1 cereals, winter s of Dummy 1 citrus n mm Dummy 1 cotton s js Dummy 1 field beans n NA Dummy 1 grass / alfalfa s of Dummy 1 hops n mm Dummy 1 legumes s js Dummy 1 maize n NA Dummy 1 oil seed rape, spring s of Dummy 1 oil seed rape, winter n mm Dummy 1 olives s js Dummy 1 pome / stone fruit, early applns n NA Dummy 1 pome / stone fruit, late applns s of Dummy 1 potatoes n mm Dummy 1 soybeans s js Dummy 1 sugar beets n NA Dummy 1 sunflowers s of Dummy 1 tobacco n mm Dummy 1 vegetables, bulb s js Dummy 1 vegetables, fruiting n NA Dummy 1 vegetables, leafy s of Dummy 1 vegetables, root n mm Dummy 1 vines, early applns s js Dummy 1 vines, late applns n NA Dummy 1 appln, aerial s of Dummy 1 appln, hand (crop < 50 cm) n mm Dummy 1 appln, hand (crop > 50 cm) s js Dummy 1 no drift (incorp or seed trtmt) n NA Dummy 1 cereals, spring n NA Dummy 1 cereals, winter s of Dummy 1 citrus n mm Dummy 1 cotton s js Dummy 1 field beans n NA Dummy 1 grass / alfalfa s of Dummy 1 hops n mm Dummy 1 legumes s js Dummy 1 maize n NA Dummy 1 oil seed rape, spring s of Dummy 1 oil seed rape, winter n mm Dummy 1 olives s js Dummy 1 pome / stone fruit, early applns n NA Dummy 1 pome / stone fruit, late applns s of Dummy 1 potatoes n mm Dummy 1 soybeans s js Dummy 1 sugar beets n NA Dummy 1 sunflowers s of Dummy 1 tobacco n mm Dummy 1 vegetables, bulb s js Dummy 1 vegetables, fruiting n NA Dummy 1 vegetables, leafy s of Dummy 1 vegetables, root n mm Dummy 1 vines, early applns s js Dummy 1 vines, late applns n NA Dummy 1 appln, aerial s of Dummy 1 appln, hand (crop < 50 cm) n mm Dummy 1 appln, hand (crop > 50 cm) s js Dummy 1 no drift (incorp or seed trtmt) n NA -99.00 -99.00 6000.00 344.80 0.00E+00 6.00 0.00E+00 0.00E+00 3000.00 1.00 0.00E+00 0.00E+00 1.00 2.00 3.00 4.00 5.00 6.00 7.00 8.00 9.00 10.00 11.00 12.00 13.00 14.00 15.00 16.00 17.00 18.00 19.00 20.00 21.00 22.00 23.00 24.00 25.00 26.00 27.00 28.00 0.00E+00 -99.00 -99.00 -99.00 0.00E+00 1.00
+M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js M1 cereals, winter n NA M1 cereals, winter s of M1 cereals, winter n mm M1 cereals, winter s js 250.00 100.00 100.00 50.00 100.00 100.00 0.00E+00 50.00 1000.00 1.00 0.00E+00 1.00 -99.00 -99.00 -99.00 -99.00 0.00E+00 1.00

Contact - Imprint