adds explicit as.factor in rank_onerep

Includes NEWS bullet. Roxygen updates must also have changed .Rd line-break rules.
NCEAS · May 3, 2020 · 34fd696 · 34fd696
1 parent ba52a29
commit 34fd696
Show file tree

Hide file tree

Showing 23 changed files with 165 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -47,4 +47,4 @@ URL: https://github.com/NCEAS/codyn/
 BugReports: https://github.com/NCEAS/codyn/issues
 LazyData: true
 VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0
diff --git a/NEWS b/NEWS
@@ -1,3 +1,10 @@
+Version 2.0.4
+-------------
+
+BUG FIXES
+
+* Adapt to R 4.0 breaking change for string to factor conversion (PR # 118)
+
 Version 2.0.3
 -------------
 

diff --git a/R/rank_shift.R b/R/rank_shift.R
@@ -157,7 +157,7 @@ rank_onerep <- function(df, time.var,
 
   MRS <- sapply(rankdiff, function(x) mean(x$abs_ch_rank))
 
-  data.frame(year_pair = names(MRS), MRS, row.names = NULL)
+  data.frame(year_pair = as.factor(names(MRS)), MRS, row.names = NULL)
 }
 
 

diff --git a/man/RAC_change.Rd b/man/RAC_change.Rd
diff --git a/man/RAC_difference.Rd b/man/RAC_difference.Rd
diff --git a/man/abundance_change.Rd b/man/abundance_change.Rd
diff --git a/man/abundance_difference.Rd b/man/abundance_difference.Rd
diff --git a/man/collins08.Rd b/man/collins08.Rd
diff --git a/man/community_diversity.Rd b/man/community_diversity.Rd
diff --git a/man/community_structure.Rd b/man/community_structure.Rd
diff --git a/man/curve_change.Rd b/man/curve_change.Rd
diff --git a/man/curve_difference.Rd b/man/curve_difference.Rd
diff --git a/man/cyclic_shift.Rd b/man/cyclic_shift.Rd
diff --git a/man/knz_001d.Rd b/man/knz_001d.Rd
diff --git a/man/mean_rank_shift.Rd b/man/mean_rank_shift.Rd
diff --git a/man/multivariate_change.Rd b/man/multivariate_change.Rd
diff --git a/man/multivariate_difference.Rd b/man/multivariate_difference.Rd
diff --git a/man/pplots.Rd b/man/pplots.Rd
diff --git a/man/rank_shift.Rd b/man/rank_shift.Rd
diff --git a/man/rate_change_interval.Rd b/man/rate_change_interval.Rd
diff --git a/man/synchrony.Rd b/man/synchrony.Rd
diff --git a/man/turnover.Rd b/man/turnover.Rd
diff --git a/man/variance_ratio.Rd b/man/variance_ratio.Rd
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,7 +157,7 @@ rank_onerep <- function(df, time.var, @@
       MRS <- sapply(rankdiff, function(x) mean(x$abs_ch_rank))
-      data.frame(year_pair = names(MRS), MRS, row.names = NULL)
+      data.frame(year_pair = as.factor(names(MRS)), MRS, row.names = NULL)
     }
@@ Expand Down @@