Skip to content

Commit e6dde16

Browse files
committed
more
1 parent 52bc15f commit e6dde16

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

.nojekyll

Whitespace-only changes.

DESCRIPTION

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: genie
22
Type: Package
33
Title: Fast, Robust, and Outlier Resistant Hierarchical Clustering
4-
Version: 1.0.6
5-
Date: 2020-08-02
4+
Version: 1.0.6.9001
5+
Date: 2022-08-08
66
Authors@R: c(
77
person("Marek", "Gagolewski",
88
role = c("aut", "cre", "cph"),
@@ -25,10 +25,13 @@ Description: Includes the reference implementation of Genie - a hierarchical
2525
linkage approach, therefore it is also suitable for analysing larger data sets.
2626
For more details see (Gagolewski et al. 2016 <DOI:10.1016/j.ins.2016.05.003>).
2727
For an even faster and more feature-rich implementation, including,
28-
amongst others, noise point detection, see the 'genieclust' package.
28+
amongst others, noise point detection, see the 'genieclust' package
29+
(Gagolewski, 2021 <DOI:10.1016/j.softx.2021.100722>).
2930
License: GPL (>= 3)
3031
BugReports: http://github.com/gagolews/genie/issues
31-
URL: http://genieclust.gagolewski.com/
32+
URL:
33+
http://genieclust.gagolewski.com/
34+
https://github.com/gagolews/genie
3235
Depends:
3336
R (>= 3.3.0),
3437
stats,

NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## 1.0.6 (under development)
66

7-
* ...
7+
* ... (nothing yet)
88

99

1010

README.md

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Genie (R Package)
22

3-
> This project has been superseded by [genieclust](https://genieclust.gagolewski.com),
4-
which features a faster and more feature-rich implementation of Genie (now also
5-
available for both R and Python).
3+
> This project has been superseded by
4+
[genieclust](https://genieclust.gagolewski.com),
5+
which features a faster and more feature-rich implementation
6+
of Genie (available for both R and Python).
67

78

89
## A Fast and Robust Hierarchical Clustering Algorithm
910

10-
[![Build Status](https://travis-ci.org/gagolews/genie.png?branch=master)](https://travis-ci.org/gagolews/genie)
11-
1211
The time needed to apply a hierarchical clustering algorithm
1312
is most often dominated by the number of computations of a pairwise
1413
dissimilarity measure. Such a constraint, for larger data sets,
@@ -25,7 +24,7 @@ This method most often outperforms the Ward or average linkage in terms of
2524
the clustering quality on benchmark data. At the same time,
2625
Genie retains the high speed of the single linkage approach,
2726
therefore it is also suitable for analysing larger data sets.
28-
The algorithm is easily parallelizable and thus may be run
27+
The algorithm is easily parallelisable and thus may be run
2928
on multiple threads to speed up its execution further on.
3029
Its memory overhead is small: there is no need to precompute the complete
3130
distance matrix to perform the computations in order to obtain a desired
@@ -34,13 +33,20 @@ clustering.
3433
A detailed description of the algorithm can be found in:
3534

3635
Gagolewski M., Bartoszuk M., Cena A., Genie: A new, fast, and outlier-resistant
37-
hierarchical clustering algorithm, Information Sciences, 2016,
38-
[doi:10.1016/j.ins.2016.05.003](http://dx.doi.org/10.1016/j.ins.2016.05.003).
36+
hierarchical clustering algorithm, *Information Sciences* **363**, 2016, 8–23.
37+
[doi:10.1016/j.ins.2016.05.003](https://dx.doi.org/10.1016/j.ins.2016.05.003).
38+
39+
See also:
40+
41+
Gagolewski M., genieclust: Fast and robust hierarchical clustering,
42+
*SoftwareX* **15**, 2021, 100722.
43+
[doi:10.1016/j.softx.2021.100722](https://dx.doi.org/10.1016/j.softx.2021.100722).
44+
3945

4046
**Authors**: [Marek Gagolewski](http://www.gagolewski.com/),
4147
[Maciej Bartoszuk](http://bartoszuk.rexamine.com), and
4248
[Anna Cena](http://cena.rexamine.com)
4349

4450
**CRAN entry**: http://cran.r-project.org/web/packages/genie/
4551

46-
**See also**: http://genieclust.gagolewski.com/
52+
**genieclust**: http://genieclust.gagolewski.com/

src/hclust2_distance.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ StringDistanceDouble::StringDistanceDouble(const Rcpp::List& vectors) :
546546
items[i] = REAL(cur);
547547

548548
for (size_t j=0; j<lengths[i]; ++j)
549-
if (items[i][j] == NA_REAL)
549+
if (ISNA(items[i][j]))
550550
Rcpp::stop("missing values in input objects are not allowed");
551551
}
552552
}

0 commit comments

Comments
 (0)