Merge pull request #31 from SantanderMetGroup/devel

merge devel into master

NEWS

@@ -83,3 +83,8 @@ See the [Releases section](https://github.com/SantanderMetGroup/transformeR/rele
  * Changes in `clusterGrid` structure to allow for flexible prediction
  * Add subsetting by cluster in `subsetGrid`
  * Other minor bug fixes and documentation updates
+
+## 1.7.1 (5 Feb 2020)
+ * Allow type = NULL in `dataSplit' function.
+ * Add zenodo badge in documentation
+ * Other minor documentation issues.

R/dataSplit.R

@@ -22,7 +22,8 @@
 #' @param y The observations object.
 #' @param f Could be a fraction, value between (0,1) indicating the fraction of the data that will define the train set, 
 #' or an integer indicating the number of folds. It can also be a list of folds indicating the years of each fold. 
-#' @param type A string, c("random","chronological"), indicating if the splits should be random or in a chronological order. 
+#' @param type A string. Indicates if the splitting should be random (type = "random"),
+#' chronological (type = "chronological") or specified by the user (type = NULL). Default is "random". 
 #' Default is "random".
 #' @return A list of folds containing the x and y splitted.
 #' @author J. Bano-Medina
@@ -64,7 +65,6 @@
 #' str(data.splitted[[3]]$test$y$Dates)  # 1 fold out of 3 for test
 
 dataSplit <- function(x, y, f = 3/4, type = "random") {
-    type <- match.arg(type, choices = c("random", "chronological"))
     if (is.numeric(f)) {
         if (f < 1) {
             out <- vector("list", 2)

inst/c4R_welcome

@@ -1,11 +1,9 @@
-______________________________________________________
-    _______   ____  ________ __________  __  ________ 
+
+    _______   ____  ___________________  __  ________ 
    / ___/ /  / /  |/  / __  /_  __/ __/ / / / / __  / 
   / /  / /  / / /|_/ / /_/ / / / / __/ / /_/ / /_/_/  
  / /__/ /__/ / /  / / __  / / / / /__ /___  / / \ \ 
  \___/____/_/_/  /_/_/ /_/ /_/  \___/    /_/\/   \_\ 
 
       github.com/SantanderMetGroup/climate4R
-_____________________________________________________
-