diff --git a/DESCRIPTION b/DESCRIPTION index 9916014..3b7a303 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: fistools Title: Tools & data used for wildlife management & invasive species in Flanders -Version: 1.1.2 +Version: 1.1.3 Authors@R: c( person(given = "Sander", middle = "", family = "Devisscher", "sander.devisscher@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-2015-5731")), diff --git a/R/col_content_compare.R b/R/col_content_compare.R index b3b0809..330d134 100644 --- a/R/col_content_compare.R +++ b/R/col_content_compare.R @@ -16,8 +16,8 @@ #' @examples #' \dontrun{ #' dataset1 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "c", "d", "e")) -#' dataset2 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "f", "d", "e")) -#' col_content_compare(df1 = dataset1, "b", df2 = dataset2, "b") +#' dataset2 <- data.frame(c = c(1, 2, 3, 4, 5), d = c("a", "b", "f", "d", "e")) +#' col_content_compare(df1 = dataset1, "b", df2 = dataset2, "d") #' } #' #' @export @@ -69,10 +69,10 @@ col_content_compare <- function(df1, col1, df2, col2) { missing_from_col1 <- setdiff(col2_unique, col1_unique) # Print the results - print(paste0("Values missing from ", df1_name, "$", col1, " but in ", df2_name, "$", col2, ":")) + print(paste0("Values missing from ", df2_name, "$", col2, " but in ", df1_name, "$", col1, ":")) print(missing_from_col2) - print(paste0("Values missing from ", df2_name, "$", col2, " but in ", df1_name, "$", col1, ":")) + print(paste0("Values missing from ", df1_name, "$", col1, " but in ", df2_name, "$", col2, ":")) print(missing_from_col1) print("Values in both columns:") diff --git a/docs/404.html b/docs/404.html index f2c62e6..a787a91 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html index fe9a7f6..ca2636a 100644 --- a/docs/CODE_OF_CONDUCT.html +++ b/docs/CODE_OF_CONDUCT.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 0f0c9ab..d7269c2 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 639896e..17f4b88 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/authors.html b/docs/authors.html index d907dab..a00841d 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 @@ -70,13 +70,13 @@

Citation

Devisscher S, Pallemaerts L, Delva S, Cartuyvels E, Bollen M (2024). fistools: Tools & data used for wildlife management & invasive species in Flanders. -R package version 1.1.2. +R package version 1.1.3.

@Manual{,
   title = {fistools: Tools & data used for wildlife management & invasive species in Flanders},
   author = {Sander Devisscher and Lynn Pallemaerts and Soria Delva and Emma Cartuyvels and Martijn Bollen},
   year = {2024},
-  note = {R package version 1.1.2},
+  note = {R package version 1.1.3},
 }
diff --git a/docs/index.html b/docs/index.html index f37b5a5..4c6c0cc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index bb9cd08..d834230 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,4 +2,4 @@ pandoc: 2.9.2.1 pkgdown: 2.1.0 pkgdown_sha: ~ articles: {} -last_built: 2024-07-29T16:03Z +last_built: 2024-07-31T18:46Z diff --git a/docs/reference/CRS_extracter.html b/docs/reference/CRS_extracter.html index c2b5d64..d7d3025 100644 --- a/docs/reference/CRS_extracter.html +++ b/docs/reference/CRS_extracter.html @@ -19,7 +19,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/UUID_List.html b/docs/reference/UUID_List.html index eb714b1..24ebc04 100644 --- a/docs/reference/UUID_List.html +++ b/docs/reference/UUID_List.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/apply_grtsdb.html b/docs/reference/apply_grtsdb.html index 5b5cccf..78d10c8 100644 --- a/docs/reference/apply_grtsdb.html +++ b/docs/reference/apply_grtsdb.html @@ -18,7 +18,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/boswachterijen.html b/docs/reference/boswachterijen.html index 3257dd9..cc303d0 100644 --- a/docs/reference/boswachterijen.html +++ b/docs/reference/boswachterijen.html @@ -18,7 +18,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/calculate_polygon_centroid.html b/docs/reference/calculate_polygon_centroid.html index 130eed6..44fe8c8 100644 --- a/docs/reference/calculate_polygon_centroid.html +++ b/docs/reference/calculate_polygon_centroid.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/check.html b/docs/reference/check.html index d1cbc12..e1de69f 100644 --- a/docs/reference/check.html +++ b/docs/reference/check.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/cleanup_sqlite.html b/docs/reference/cleanup_sqlite.html index 54fcd60..6ea9593 100644 --- a/docs/reference/cleanup_sqlite.html +++ b/docs/reference/cleanup_sqlite.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/col_content_compare.html b/docs/reference/col_content_compare.html index e3412a2..2513878 100644 --- a/docs/reference/col_content_compare.html +++ b/docs/reference/col_content_compare.html @@ -19,7 +19,7 @@ fistools - 1.1.2 + 1.1.3 @@ -85,8 +85,8 @@

Author

Examples

 if (FALSE) { # \dontrun{
 dataset1 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "c", "d", "e"))
-dataset2 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "f", "d", "e"))
-col_content_compare(df1 = dataset1, "b", df2 = dataset2, "b")
+dataset2 <- data.frame(c = c(1, 2, 3, 4, 5), d = c("a", "b", "f", "d", "e"))
+col_content_compare(df1 = dataset1, "b", df2 = dataset2, "d")
 } # }
 
 
diff --git a/docs/reference/colcompare.html b/docs/reference/colcompare.html index 054cda1..fee1fee 100644 --- a/docs/reference/colcompare.html +++ b/docs/reference/colcompare.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/collect_osm_features.html b/docs/reference/collect_osm_features.html index 945b25f..54525f3 100644 --- a/docs/reference/collect_osm_features.html +++ b/docs/reference/collect_osm_features.html @@ -23,7 +23,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/download_dep_media.html b/docs/reference/download_dep_media.html index 520c2d6..3199a7f 100644 --- a/docs/reference/download_dep_media.html +++ b/docs/reference/download_dep_media.html @@ -18,7 +18,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/download_gdrive_if_missing.html b/docs/reference/download_gdrive_if_missing.html index 50a1436..225f332 100644 --- a/docs/reference/download_gdrive_if_missing.html +++ b/docs/reference/download_gdrive_if_missing.html @@ -19,7 +19,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/download_seq_media.html b/docs/reference/download_seq_media.html index 4782ef2..3c4864c 100644 --- a/docs/reference/download_seq_media.html +++ b/docs/reference/download_seq_media.html @@ -18,7 +18,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/drg_example.html b/docs/reference/drg_example.html index f71cd65..efd2149 100644 --- a/docs/reference/drg_example.html +++ b/docs/reference/drg_example.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/index.html b/docs/reference/index.html index 44a8ea6..6043cb4 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/install_sp.html b/docs/reference/install_sp.html index 28976f6..313c0ed 100644 --- a/docs/reference/install_sp.html +++ b/docs/reference/install_sp.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/label_converter.html b/docs/reference/label_converter.html index 7cc866e..df8ff6b 100644 --- a/docs/reference/label_converter.html +++ b/docs/reference/label_converter.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/docs/reference/lib_crs.html b/docs/reference/lib_crs.html index f00437a..a4fdbbc 100644 --- a/docs/reference/lib_crs.html +++ b/docs/reference/lib_crs.html @@ -17,7 +17,7 @@ fistools - 1.1.2 + 1.1.3 diff --git a/man/col_content_compare.Rd b/man/col_content_compare.Rd index fdd1a6c..248c3e3 100644 --- a/man/col_content_compare.Rd +++ b/man/col_content_compare.Rd @@ -27,8 +27,8 @@ missing from the second column, and the values that are in both columns. \examples{ \dontrun{ dataset1 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "c", "d", "e")) -dataset2 <- data.frame(a = c(1, 2, 3, 4, 5), b = c("a", "b", "f", "d", "e")) -col_content_compare(df1 = dataset1, "b", df2 = dataset2, "b") +dataset2 <- data.frame(c = c(1, 2, 3, 4, 5), d = c("a", "b", "f", "d", "e")) +col_content_compare(df1 = dataset1, "b", df2 = dataset2, "d") } }