Update NEWS. Rebuild vignettes.

r-spatial · May 2, 2017 · af6983a · af6983a
1 parent 6b0a837
commit af6983a
Show file tree

Hide file tree

Showing 26 changed files with 7 additions and 1,620 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -37,8 +37,7 @@ Imports:
     lubridate,
     caret,
     mgcv,
-    xtable,
-    dtwclust
+    xtable
 Suggests:
     testthat,
     knitr,

diff --git a/NAMESPACE b/NAMESPACE
@@ -82,7 +82,6 @@ importFrom(dtw,asymmetric)
 importFrom(dtw,rabinerJuangStepPattern)
 importFrom(dtw,symmetric1)
 importFrom(dtw,symmetric2)
-importFrom(dtwclust,tsclust)
 importFrom(grDevices,gray.colors)
 importFrom(grDevices,terrain.colors)
 importFrom(lubridate,"day<-")

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# dtwSat v0.2.3.9000
+
+* New features 
+
+  Register TWDTW as a distance function into package proxy. 
+
 # dtwSat v0.2.2 Release Notes
 
 * New features

diff --git a/R/twdtwDist.R b/R/twdtwDist.R
@@ -9,19 +9,3 @@
   as.matrix(d)
 }
 
-# library(dtwSat)
-# library(dtw)
-# library(dtwclust)
-# log_fun = logisticWeight(-0.1, 100)
-# phi = proxy::dist(x=MOD13Q1.patterns.list, y=MOD13Q1.patterns.list[1:2], method="TWDTW", weight.fun=log_fun)
-# phi
-# a=twdtwApply(twdtwTimeSeries(MOD13Q1.patterns.list), twdtwTimeSeries(MOD13Q1.patterns.list), n=1, weight.fun=log_fun)
-# a[[3]]
-# 
-# aux = c(MOD13Q1.patterns.list, MOD13Q1.patterns.list, MOD13Q1.patterns.list)
-# a1 = tsclust(series = aux, distance = "DTW", trace = TRUE, type = "hierarchical", k = 3)
-# log_fun = logisticWeight(-0.1, 100)
-# a2 = tsclust(series = aux, distance = "TWDTW", trace = TRUE, type = "hierarchical", k = 3, weight.fun=log_fun, span = 300)
-# a1
-# a2
-
diff --git a/R/zzz.R b/R/zzz.R
@@ -44,7 +44,6 @@
 #' @importFrom lubridate month month<- day day<- year year<-
 #' @importFrom caret createDataPartition 
 #' @importFrom xtable xtable print.xtable
-#' @importFrom dtwclust tsclust 
 #' @useDynLib dtwSat, .registration = TRUE
 #' 
 NULL

diff --git a/inst/doc/applying_twdtw.pdf b/inst/doc/applying_twdtw.pdf
diff --git a/vignettes/applying_twdtw.R b/vignettes/applying_twdtw.R
diff --git a/vignettes/applying_twdtw.pdf b/vignettes/applying_twdtw.pdf