diff --git a/DESCRIPTION b/DESCRIPTION index d9af486..da64c84 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rCBA Title: CBA Classifier for R -Version: 0.4.1 +Version: 0.4.2 Authors@R: c(person("Jaroslav", "Kuchar", email = "jaroslav.kuchar@gmail.com", role = c("aut", "cre")), person("Tomas", "Kliegr", email="kliegr@gmail.com", role = c("ctb"))) Author: Jaroslav Kuchar [aut, cre], @@ -24,6 +24,6 @@ RoxygenNote: 6.0.1 Collate: 'init.R' 'build.R' 'buildFPGrowth.R' 'classification.R' 'fpgrowth.R' 'pruning.R' 'utils.R' NeedsCompilation: no -Packaged: 2018-05-09 08:45:25 UTC; vagrant +Packaged: 2018-05-16 19:56:11 UTC; vagrant Repository: CRAN -Date/Publication: 2018-05-09 08:55:27 UTC +Date/Publication: 2018-05-16 20:06:54 UTC diff --git a/MD5 b/MD5 index 78f9eea..6f257dc 100644 --- a/MD5 +++ b/MD5 @@ -1,11 +1,11 @@ -b51c0c6cd49bc2a6ffec2279f2bacaed *DESCRIPTION +bc14a20b417c9bbca2cc4b01720ba25d *DESCRIPTION 6471b35750096a78e542e400fe5c0772 *NAMESPACE -b8e536dc00c09817b2f72338dbf0bcc7 *NEWS +ee83c2e52e7a356c1498981a731dd211 *NEWS 83297d4f7cfffc05a935fcd4024df0d3 *R/build.R 820f12f0cc8238abd988747cd0ac26dc *R/buildFPGrowth.R 46c15ea077444ca6c6240724af8b55d0 *R/classification.R c1d522673ce558cd3a2c4f5f224cd2ab *R/fpgrowth.R -cda62193dbbd51d46c2a8aeddf75789e *R/init.R +d52e4bcf7347d8c2c41d1f10f047c8bb *R/init.R f3a7313f2294011dcc8f5ed3a80e6a70 *R/pruning.R 9751da027373f016981144bfab2419f5 *R/utils.R 1121f148e65ea22fc688b863e9304390 *inst/java/classes/cz/jkuchar/rcba/Application.class diff --git a/NEWS b/NEWS index cc4956c..45eb512 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +rCBA 0.4.2 (Release date: 2018-05-16) +============== + +Changes: + +* Support for Java 9,10 - updated test for minimum Java version + + rCBA 0.4.1 (Release date: 2018-05-09) ============== diff --git a/R/init.R b/R/init.R index dccb06c..ec9a3e3 100644 --- a/R/init.R +++ b/R/init.R @@ -8,9 +8,9 @@ .onLoad <- function(libname, pkgname ){ .jinit() jv <- .jcall("java/lang/System", "S", "getProperty", "java.runtime.version") - if(substr(jv, 1L, 1L) == "1") { + if(substr(jv, 1L, 2L) == "1.") { jvn <- as.numeric(paste0(strsplit(jv, "[.]")[[1L]][1:2], collapse = ".")) - if(jvn < 1.8) stop("Java 8 is needed for this package but not available") + if(jvn < 1.8) stop("Java >= 8 is needed for this package but not available") } } @@ -18,9 +18,9 @@ init <- function(){ # initialize rJava .jinit() jv <- .jcall("java/lang/System", "S", "getProperty", "java.runtime.version") - if(substr(jv, 1L, 1L) == "1") { + if(substr(jv, 1L, 2L) == "1.") { jvn <- as.numeric(paste0(strsplit(jv, "[.]")[[1L]][1:2], collapse = ".")) - if(jvn < 1.8) stop("Java 8 is needed for this package but not available") + if(jvn < 1.8) stop("Java >= 8 is needed for this package but not available") } # add java implementation to classpath .jaddClassPath(dir(paste(path.package("rCBA"), "/java/", sep=""), full.names=TRUE))