aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2017-10-13 12:37:43 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2017-10-13 12:37:43 +0200
commit5cba6b4cdaee9fdb24f9cea338aafb522ceb0361 (patch)
tree0d8fb1f43ae5d9e7f97c5087fca8f94674e8bf65 /docs
parent28425283bdeb34fac01d1eeb9c8dd40f987934ea (diff)
Install with drat, static documentation rebuilt by pkgdown
Diffstat (limited to 'docs')
-rw-r--r--docs/articles/gmkin_manual.R34
-rw-r--r--docs/index.html13
2 files changed, 41 insertions, 6 deletions
diff --git a/docs/articles/gmkin_manual.R b/docs/articles/gmkin_manual.R
new file mode 100644
index 0000000..0fd5ece
--- /dev/null
+++ b/docs/articles/gmkin_manual.R
@@ -0,0 +1,34 @@
+## ---- include = FALSE----------------------------------------------------
+library(knitr)
+opts_chunk$set(tidy = FALSE, cache = FALSE)
+
+## ---- eval = FALSE-------------------------------------------------------
+# library(gmkin)
+
+## ---- eval = FALSE-------------------------------------------------------
+# gmkin()
+
+## ---- eval = FALSE-------------------------------------------------------
+# write.table(schaefer07_complex_case, sep = ",", dec = ".",
+# row.names = FALSE, quote = FALSE,
+# file = "schaefer07.csv")
+
+## ---- eval = FALSE-------------------------------------------------------
+# Model cost at call 1 : 15156.12
+# Model cost at call 3 : 15156.12
+# Model cost at call 7 : 14220.79
+# Model cost at call 8 : 14220.79
+# Model cost at call 11 : 14220.79
+# Model cost at call 12 : 3349.268
+# Model cost at call 15 : 3349.268
+# Model cost at call 17 : 788.6367
+# Model cost at call 18 : 788.6366
+# Model cost at call 22 : 374.0575
+# Model cost at call 23 : 374.0575
+# Model cost at call 27 : 371.2135
+# Model cost at call 28 : 371.2135
+# Model cost at call 32 : 371.2134
+# Model cost at call 36 : 371.2134
+# Model cost at call 37 : 371.2134
+# Optimisation by method Port successfully terminated.
+
diff --git a/docs/index.html b/docs/index.html
index 38efd2c..7d2d95a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -68,14 +68,15 @@
<div id="installing-gmkin-and-gwidgetswww2" class="section level3">
<h3 class="hasAnchor">
<a href="#installing-gmkin-and-gwidgetswww2" class="anchor"></a>Installing gmkin and gWidgetsWWW2</h3>
-<p>Windows and Linux users running R 3.1.0 or later can make use of the package repository on R-Forge. Before installing gmkin, you should update your R packages already installed, e.g. by starting R, and pasting the command</p>
+<p>Windows and Linux users running R 3.1.0 or later can make use of my drat package repository on github. Before installing gmkin, you should update your R packages already installed, e.g. by starting R, and pasting the command</p>
<div class="sourceCode"><pre class="sourceCode s"><code class="sourceCode gnuassembler">update.packages()</code></pre></div>
<p>or similar, depending on your R installation.</p>
-<p>For installing gmkin or upgrading to the latest released version, please use the command</p>
-<div class="sourceCode"><pre class="sourceCode s"><code class="sourceCode gnuassembler">install.packages(<span class="st">"gmkin"</span>, repos = c(<span class="st">"http://r-forge.r-project.org"</span>, getOption(<span class="st">"repos"</span>)))</code></pre></div>
-<p>If you have not set your CRAN mirror yet, you may have to select one from the list that appears.</p>
-<p>The above command temporarily adds the R-Forge repository to your package sources. It should pull the gmkin package and its dependencies, notably the gWidgetsWWW2 package which is not available from the CRAN archive (see below). Mac users that have the necessary development files installed can probably install from the source files in this repository (not tested).</p>
-<p>In a previous version of this README I have described how to permanently add the R-Forge repository to your options. However, I noticed this has unwanted side effects, so I do not recommend it any longer. Therefore, you may want to revert such changes to your R startup options.</p>
+<p>For installing gmkin or upgrading to the latest released version, please install the drat package</p>
+<div class="sourceCode"><pre class="sourceCode s"><code class="sourceCode gnuassembler">install.packages(<span class="st">"drat"</span>)</code></pre></div>
+<p>add my repository</p>
+<div class="sourceCode"><pre class="sourceCode s"><code class="sourceCode gnuassembler"><span class="kw">drat::</span>addRepo(<span class="st">"jranke"</span>)</code></pre></div>
+<p>and install as usual</p>
+<div class="sourceCode"><pre class="sourceCode s"><code class="sourceCode gnuassembler">install.packages(<span class="st">"gmkin"</span>)</code></pre></div>
<p>The latest changes to gmkin are recorded in the <a href="https://github.com/jranke/gmkin/blob/master/NEWS.md">NEWS</a> file, more details can be found in the <a href="https://github.com/jranke/gmkin/commits/master">commit history</a>.</p>
<p><img src="gmkin_screenshot.png" alt="gmkin screenshot"></p>
</div>

Contact - Imprint