interpolate fix

NEWS.md

@@ -1,6 +1,7 @@
 # tourr 1.0.1
 
 * Edges now working correctly in display_groupxy 
+* Interpolate had an error in calculating distance between planes which is fixed
 
 # tourr 1.0.0
 

R/interpolate.r

@@ -9,11 +9,13 @@
 #' @keywords hplot
 #' @export
 #' @examples
-#' t1 <- save_history(flea[, 1:6], grand_tour(1), max = 10)
+#' t1 <- save_history(flea[, 1:6], grand_tour(1), max = 3)
 #' dim(t1)
 #' dim(interpolate(t1, 0.01))
 #' dim(interpolate(t1, 0.05))
 #' dim(interpolate(t1, 0.1))
+#' t2 <- save_history(flea[, 1:6], grand_tour(2), max = 2)
+#' dim(interpolate(t2, 0.05))
 interpolate <- function(basis_set, angle = 0.05, cycle = FALSE) {
  basis_set <- as.array(basis_set)
  n <- dim(basis_set)[3]
@@ -33,7 +35,8 @@ interpolate <- function(basis_set, angle = 0.05, cycle = FALSE) {
  )
  # Estimate number of bases in output
  dists <- sapply(2:n, function(i) {
- proj_dist(basis_set[[i - 1]], basis_set[[i]])
+# proj_dist(basis_set[[i - 1]], basis_set[[i]])
+ proj_dist(apply(basis_set[,,i - 1], 2, c), apply(basis_set[,,i], 2, c))
  })
  steps <- sum(ceiling(dists / angle)) * 2