Skip to content

Commit ecc7eda

Browse files
committed
add vignettes
.ellipses->ellipses .convex.hulls->convex.hulls
1 parent 7bf09af commit ecc7eda

File tree

9 files changed

+69
-14
lines changed

9 files changed

+69
-14
lines changed

NAMESPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
export(.convex.hulls)
4-
export(.ellipses)
53
export(cl.analysis)
64
export(cl.features)
75
export(cl.plot)
86
export(cl.summary)
7+
export(convex.hulls)
8+
export(ellipses)
99
export(nums)
1010
export(open_spending.cl)
1111
import(car)

R/cl.analysis.r

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ cl.analysis = function(cl.data, cl_feature = NULL, amount = NULL, cl.aggregate =
193193

194194
# ellipses + convex hulls
195195

196-
cluster.ellipses = .ellipses(modelparam, data.pca)
196+
cluster.ellipses = ellipses(modelparam, data.pca)
197197

198-
cluster.convex.hulls = .convex.hulls(modelparam, data.pca)
198+
cluster.convex.hulls = convex.hulls(modelparam, data.pca)
199199

200200
## model parameters
201201

@@ -234,9 +234,9 @@ cl.analysis = function(cl.data, cl_feature = NULL, amount = NULL, cl.aggregate =
234234

235235
### ellipses + convex hulls
236236

237-
cluster.ellipses = .ellipses( modelparam, data.pca )
237+
cluster.ellipses = ellipses( modelparam, data.pca )
238238

239-
cluster.convex.hulls = .convex.hulls( modelparam, data.pca )
239+
cluster.convex.hulls = convex.hulls( modelparam, data.pca )
240240

241241
## model parameters
242242

@@ -273,9 +273,9 @@ cl.analysis = function(cl.data, cl_feature = NULL, amount = NULL, cl.aggregate =
273273
)
274274
## ellipses + convex hulls
275275

276-
cluster.ellipses = .ellipses(modelparam, data.pca)
276+
cluster.ellipses = ellipses(modelparam, data.pca)
277277

278-
cluster.convex.hulls = .convex.hulls(modelparam, data.pca)
278+
cluster.convex.hulls = convex.hulls(modelparam, data.pca)
279279

280280
## model parameters
281281

@@ -313,9 +313,9 @@ cl.analysis = function(cl.data, cl_feature = NULL, amount = NULL, cl.aggregate =
313313

314314
## ellipses + convex hulls
315315

316-
cluster.ellipses = .ellipses(modelparam, data.pca)
316+
cluster.ellipses = ellipses(modelparam, data.pca)
317317

318-
cluster.convex.hulls = .convex.hulls(modelparam, data.pca)
318+
cluster.convex.hulls = convex.hulls(modelparam, data.pca)
319319

320320
## model parameters
321321

R/cl.plot.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cl.plot <- function(clustering.model, parameters = list()) {
6969
#' @param data.pca data as result of the \code{stats::prcomp(clustering.model$data, scale. = T, center = T)}.
7070
#' @return List of vectors with points for each ellipse.
7171
#' @export
72-
.ellipses <- function(clustering.model, data.pca) {
72+
ellipses <- function(clustering.model, data.pca) {
7373
lapply(
7474
unique(clustering.model$clusters),
7575
function(cl) {
@@ -94,7 +94,7 @@ cl.plot <- function(clustering.model, parameters = list()) {
9494
#' @param data.pca data as result of the \code{stats::prcomp(clustering.model$data, scale. = T, center = T)}.
9595
#' @return List of vectors with points for each convex hull.
9696
#' @export
97-
.convex.hulls <- function(clustering.model, data.pca) {
97+
convex.hulls <- function(clustering.model, data.pca) {
9898

9999
lapply(
100100

man/convex.hulls.Rd

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/ellipses.Rd

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/Cluster.OBeuOpenCPU.Rmd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Using Cluster.OBeu with OpenCPU"
33
output: rmarkdown::html_vignette
44
vignette: >
5-
%\VignetteIndexEntry{Vignette Title}
5+
%\VignetteIndexEntry{Using Cluster.OBeu with OpenCPU}
66
%\VignetteEngine{knitr::rmarkdown}
77
%\VignetteEncoding{UTF-8}
88
---
@@ -100,3 +100,6 @@ For larger datasets you can specify likewise a specific clustering feature (*cl_
100100
# Github
101101
+ [OpenCPU package *development version*](https://github.com/opencpu/opencpu)
102102
+ [Cluster.OBeu package *development version*](https://github.com/okgreece/Cluster.OBeu)
103+
104+
# CRAN
105+
+ [Cluster.OBeu on CRAN](https://cran.r-project.org/package=Cluster.OBeu)

vignettes/Cluster.OBeuOpenCPU.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,12 @@ <h1>Github</h1>
191191
<li><a href="https://github.com/okgreece/Cluster.OBeu">Cluster.OBeu package <em>development version</em></a></li>
192192
</ul>
193193
</div>
194+
<div id="cran" class="section level1">
195+
<h1>CRAN</h1>
196+
<ul>
197+
<li><a href="https://cran.r-project.org/package=Cluster.OBeu">Cluster.OBeu on CRAN</a></li>
198+
</ul>
199+
</div>
194200

195201

196202

vignettes/ClusterOBeu.Rmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Cluster analysis in OpenBudget.eu"
33
output: rmarkdown::html_vignette
44
vignette: >
5-
%\VignetteIndexEntry{Vignette Title}
5+
%\VignetteIndexEntry{Cluster analysis in OpenBudget.eu}
66
%\VignetteEngine{knitr::rmarkdown}
77
%\VignetteEncoding{UTF-8}
88
---
@@ -150,3 +150,5 @@ You add likewise further parameters and change the default parameters of `cl.met
150150
+ [OpenCPU package *development version*](https://github.com/opencpu/opencpu)
151151
+ [Cluster.OBeu package *development version*](https://github.com/okgreece/Cluster.OBeu)
152152

153+
# CRAN
154+
+ [Cluster.OBeu on CRAN](https://cran.r-project.org/package=Cluster.OBeu)

vignettes/ClusterOBeu.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,12 @@ <h1>Github</h1>
247247
<li><a href="https://github.com/okgreece/Cluster.OBeu">Cluster.OBeu package <em>development version</em></a></li>
248248
</ul>
249249
</div>
250+
<div id="cran" class="section level1">
251+
<h1>CRAN</h1>
252+
<ul>
253+
<li><a href="https://cran.r-project.org/package=Cluster.OBeu">Cluster.OBeu on CRAN</a></li>
254+
</ul>
255+
</div>
250256

251257

252258

0 commit comments

Comments
 (0)