Merge pull request #19 from TanguyBarthelemy/develop

change rjdemetra3 --> rjd3workspace and rjdemetra --> rjdverse

NEWS.md

@@ -22,6 +22,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * Initial commit
 
 
-[Unreleased]: https://github.com/rjdemetra/rjd3bench/compare/v2.0.0...HEAD
-[2.0.0]: https://github.com/rjdemetra/rjd3bench/releases/tag/v1.0.0...2.0.0
-[1.0.0]: https://github.com/rjdemetra/rjd3bench/releases/tag/v1.0.0
+[Unreleased]: https://github.com/rjdverse/rjd3bench/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/rjdverse/rjd3bench/releases/tag/v1.0.0...2.0.0
+[1.0.0]: https://github.com/rjdverse/rjd3bench/releases/tag/v1.0.0

R/benchmark.R

@@ -181,7 +181,7 @@ cholette<-function(s, t, rho=1, lambda=1, bias="None", conversion="Sum", obsposi
 #'
 #' @examples
 multivariatecholette<-function(xlist, tcvector=NULL, ccvector=NULL, rho=1, lambda=1) {
-  if(!is.list(xlist) | length(xlist) < 3) {
+  if (!is.list(xlist) | length(xlist) < 3) {
     stop("incorrect argument, first argument should be a list of at least 3 time series")}
 
   #create the input
@@ -207,7 +207,7 @@ multivariatecholette<-function(xlist, tcvector=NULL, ccvector=NULL, rho=1, lambd
     ncc<-length(ccvector)
     jcc<-.jarray(ccvector, "java/lang/String")
   }
-  if(ntc+ncc==0) {
+  if (ntc+ncc==0) {
     stop("both constraint types are empty, include at least one temporal or contemporaneous constraint")}
 
   jd_rslt<-.jcall("jdplus/benchmarking/base/r/Benchmarking", "Ljdplus/toolkit/base/r/util/Dictionary;", "multiCholette",

R/zzz.R

@@ -4,7 +4,7 @@ NULL
 
 .onLoad <- function(libname, pkgname) {
 
-  if (! requireNamespace("rjd3toolkit", quietly=TRUE)) stop("Loading rjd3 libraries failed")
+  if (!requireNamespace("rjd3toolkit", quietly = TRUE)) stop("Loading rjd3 libraries failed")
 
   result <- rJava::.jpackage(pkgname, lib.loc=libname)
   if (!result) stop("Loading java packages failed")

README.Rmd

@@ -40,11 +40,7 @@ Temporal disaggregation
 
 ## Installation
 
-<<<<<<< HEAD
 Running rjd3 packages requires **Java 17 or higher**. How to set up such a configuration in R is explained [here](https://jdemetra-new-documentation.netlify.app/#Rconfig) 
-=======
-Running rjd3 packages requires Java 17 or higher. How to set up such a configuration in R is explained [here](https://jdemetra-new-documentation.netlify.app/#installing-the-software) 
->>>>>>> ef77ccbb461db0e9605c0e64a19b51ea9abfbedd
 
 To get the current stable version (from the latest release):
 
@@ -70,4 +66,4 @@ pull requests should include **updated tests** and **updated documentation**. If
 
 ## Licensing
 
-The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/page/eupl-text-11-12).
+The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).