fixed check_win_devel() error and note

IPS-LMU · Jan 29, 2019 · a23bd3b · a23bd3b
1 parent fb0dd65
commit a23bd3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/emuR-emuRtrackdata.R b/R/emuR-emuRtrackdata.R
@@ -246,7 +246,7 @@ convert_wideToLong <- function(td, calcFreqs = F){
   # calc freq if calcFreqs = F otherwise drop column
   if(calcFreqs) {
     tracks_long = tracks_long %>% 
-      dplyr::mutate(freq = rep(seq(0, (unique(.data$sample_rate) / 2), length.out = length(tracks_colIdx)), each = n() / length(tracks_colIdx)))
+      dplyr::mutate(freq = rep(seq(0, (unique(.data$sample_rate) / 2), length.out = length(tracks_colIdx)), each = dplyr::n() / length(tracks_colIdx)))
   } else{
     tracks_long = tracks_long %>%
       dplyr::select(-.data$freq) 

diff --git a/R/emuR-get_trackdata.R b/R/emuR-get_trackdata.R
@@ -148,7 +148,7 @@
     }
   }
 
-  if(resultType == "emuRtrackdata" && class(seglist) =="emusegs"){
+  if(resultType == "emuRtrackdata" && class(seglist)[1] == "emusegs"){
     stop("resultType can only be 'trackdata', if a seglist of class 'emusegs' is passed in")
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ @@
         }
       }
-      if(resultType == "emuRtrackdata" && class(seglist) =="emusegs"){
+      if(resultType == "emuRtrackdata" && class(seglist)[1] == "emusegs"){
         stop("resultType can only be 'trackdata', if a seglist of class 'emusegs' is passed in")
       }
@@ Expand Down @@