Merge from e-sensing master

Merge branch 'master' of https://github.com/e-sensing/sits into dev

Conflicts:
	DESCRIPTION
	NAMESPACE
	R/sits_init.R

DESCRIPTION

@@ -6,8 +6,13 @@ Date: 2017-08-07
 Authors@R: c(person('Gilberto', 'Camara', role = c('aut', 'cre'), email = '[email protected]'), 
  person('Rolf', 'Simoes', role = c('aut'), email = '[email protected]'),
  person('Victor', 'Maus', role = c('aut'), email = '[email protected]'),
+<<<<<<< HEAD
  person('Rolf', 'Simoes', role = c('aut')),
  person('Luiz', 'Assis', role = c('aut')),
+=======
+ person('Luiz', 'Assis', role = c('ctb')),
+ person('Alexandre', 'Carvalho', role = c('ctb')),
+>>>>>>> 26a1ab5ce63c65970ec7bf110ffffc0d029a76f7
  person('Adeline', 'Marinho', role = c('ctb')),
  person('Lorena', 'Santos', role = c('ctb')),
  person('Gilberto', 'Queiroz', role = c('ctb'))
@@ -24,13 +29,13 @@ BugReports: https://github.com/gilbertocamara/sits/issues
 License: GPL-2 | file LICENSE
 LazyData: true
 Depends:
- dtwclust,
+ wtss,
  dtwSat,
- magrittr,
- wtss
+ magrittr
 Imports:
  caret,
  dendextend,
+ dtwclust,
  dplyr,
  e1071,
  ensurer,
@@ -70,6 +75,9 @@ Imports:
  zoo
 LinkingTo: 
  Rcpp
+Remotes:
+ e-sensing/wtss.R,
+ vwmaus/dtwSat
 RoxygenNote: 6.0.1
 Collate: 
  'RcppExports.R'

NAMESPACE

@@ -41,8 +41,6 @@ export(sits_mutate)
 export(sits_patterns)
 export(sits_plot)
 export(sits_plot_dendrogram)
-export(sits_predict)
-export(sits_predict_stack)
 export(sits_prune)
 export(sits_reassess)
 export(sits_relabel)
@@ -68,102 +66,5 @@ export(sits_whittaker)
 export(statusProcessing)
 import(dplyr)
 import(dtwSat)
-import(dtwclust)
 import(magrittr)
-importFrom(dendextend,set)
-importFrom(MASS,lda)
-importFrom(caret,createDataPartition)
-importFrom(e1071,svm)
-importFrom(ensurer,check)
-importFrom(ensurer,check_that)
-importFrom(ensurer,ensure)
-importFrom(ensurer,ensure_that)
-importFrom(ensurer,ensures_that)
-importFrom(entropy,entropy)
-importFrom(gbm,gbm)
-importFrom(ggplot2,aes)
-importFrom(ggplot2,geom_line)
-importFrom(ggplot2,ggplot)
-importFrom(ggplot2,labs)
-importFrom(ggplot2,scale_color_brewer)
-importFrom(ggplot2,scale_colour_hue)
-importFrom(grDevices,rgb)
-importFrom(glmnet,cv.glmnet)
-importFrom(jsonlite,fromJSON)
-importFrom(jsonlite,toJSON)
-importFrom(kohonen,somgrid)
-importFrom(kohonen,supersom)
-importFrom(lubridate,as_date)
-importFrom(lubridate,days)
-importFrom(lubridate,dyears)
-importFrom(lubridate,period)
-importFrom(lubridate,yday)
-importFrom(lubridate,year)
-importFrom(lubridate,ymd)
-importFrom(methods,as)
-importFrom(methods,new)
-importFrom(mgcv,gam)
-importFrom(mgcv,predict.gam)
-importFrom(mgcv,s)
-importFrom(nnet,class.ind)
-importFrom(nnet,multinom)
-importFrom(parallel,mcMap)
-importFrom(ptw,whit2)
-importFrom(purrr,is_null)
-importFrom(purrr,map)
-importFrom(purrr,map2)
-importFrom(purrr,map_df)
-importFrom(purrrlyr,by_row)
-importFrom(randomForest,randomForest)
-importFrom(raster,beginCluster)
-importFrom(raster,blockSize)
-importFrom(raster,brick)
-importFrom(raster,canProcessInMemory)
-importFrom(raster,endCluster)
-importFrom(raster,getCluster)
-importFrom(raster,getValues)
-importFrom(raster,pbClose)
-importFrom(raster,pbCreate)
-importFrom(raster,pbStep)
-importFrom(raster,rasterTmpFile)
-importFrom(raster,returnCluster)
-importFrom(raster,setValues)
-importFrom(raster,shapefile)
-importFrom(readr,col_character)
-importFrom(readr,col_date)
-importFrom(readr,col_double)
-importFrom(readr,col_integer)
-importFrom(readr,cols)
-importFrom(readr,read_csv)
-importFrom(readr,write_lines)
-importFrom(reshape2,melt)
-importFrom(signal,sgolayfilt)
-importFrom(sp,CRS)
-importFrom(sp,SpatialPoints)
-importFrom(sp,bbox)
-importFrom(sp,proj4string)
-importFrom(stats,as.formula)
-importFrom(stats,predict)
-importFrom(stats,sd)
-importFrom(stats,setNames)
-importFrom(stringr,str_detect)
-importFrom(stringr,str_extract)
-importFrom(tibble,add_column)
-importFrom(tibble,add_row)
-importFrom(tibble,as_tibble)
-importFrom(tibble,lst)
-importFrom(tibble,tibble)
-importFrom(tidyr,drop_na)
-importFrom(tidyr,nest)
-importFrom(tidyr,unnest)
-importFrom(tools,file_ext)
-importFrom(tools,file_path_sans_ext)
-importFrom(utils,head)
-importFrom(utils,tail)
-importFrom(wtss,WTSS)
-importFrom(wtss,describeCoverage)
-importFrom(wtss,listCoverages)
-importFrom(wtss,timeSeries)
-importFrom(zoo,fortify.zoo)
-importFrom(zoo,zoo)
 useDynLib(sits, .registration = TRUE)

R/sits_init.R

@@ -19,8 +19,9 @@ utils::globalVariables(c(".", "%>%", "Index", "value", "variable", "cond",
  "longitude", "latitude", "label", "coverage",
  "year", "start_date", "end_date", "time_series",
  "name", "scale_factor", "missing_value",
- "original_label", "n_members", "count",
- "segr", "frac", "total", "n"))
+ "original_label", "n_members", "n_members.n", "count",
+ "segr", "frac", "total", "n",
+ "distance", "twdtw_distances", "predicted", "new_values"))
 
 # define the dependencies of the SITS package
 #' @importFrom ensurer ensure_that ensures_that ensure check check_that
@@ -59,7 +60,6 @@ utils::globalVariables(c(".", "%>%", "Index", "value", "variable", "cond",
 #' @importFrom e1071 svm
 #' @importFrom caret createDataPartition
 #' @import dplyr
-#' @import dtwclust
 #' @import dtwSat
 #' @import magrittr
 #' @useDynLib sits, .registration = TRUE