plate dataframe contains two additional columns, row and col, compared to input data

douwe · douwe · commit 396b6b22389b · 2025-04-03T11:07:57.000+02:00
diff --git a/R/read.R b/R/read.R
@@ -150,9 +150,12 @@ read_key_plate <- function(drfile, sheet, ranges, translate = FALSE, translation
   if (length(atomicclass) == 1) {
     combined[] <- lapply(combined, coerce, atomicclass)
   } else {
+    # The first two columns are "row" and "col", added by the function plate_to_df
+    atomicclass <- c("character", "integer", atomicclass)
+
     if (length(atomicclass) != ncol(combined)) {
       rlang::abort(glue::glue(
-        "The number of atomic classes ({length(atomicclass)}) must be 1 or equal to the number of columns ({ncol(combined)}) in the combined data frame."
+        "The number of atomic classes ({length(atomicclass) - 2}) must be 1 or equal to the number of columns ({ncol(combined) - 2}) in the combined data frame."
       ))
     }
     combined[] <- Map(coerce, combined, atomicclass)
diff --git a/data-raw/guide_competition_1_0_source.yml b/data-raw/guide_competition_1_0_source.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/invalid_atomicclass.yml b/data-raw/schema_tests/invalid_atomicclass.yml
@@ -23,8 +23,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/invalid_plate_format.yml b/data-raw/schema_tests/invalid_plate_format.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/invalid_type.yml b/data-raw/schema_tests/invalid_type.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/maximal_version.yml b/data-raw/schema_tests/maximal_version.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/missing_location_element.yml b/data-raw/schema_tests/missing_location_element.yml
@@ -36,8 +36,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/missing_translations.yml b/data-raw/schema_tests/missing_translations.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/data-raw/schema_tests/missing_version.yml b/data-raw/schema_tests/missing_version.yml
@@ -36,8 +36,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/inst/extdata/example_guide.yml b/inst/extdata/example_guide.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/tests/testthat/testdata/erroneousguides/conflicting_max_version.yml b/tests/testthat/testdata/erroneousguides/conflicting_max_version.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/tests/testthat/testdata/erroneousguides/conflicting_min_version.yml b/tests/testthat/testdata/erroneousguides/conflicting_min_version.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/tests/testthat/testdata/erroneousguides/invalid_platedata_range.yml b/tests/testthat/testdata/erroneousguides/invalid_platedata_range.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/tests/testthat/testdata/erroneousguides/missing_plate_format.yml b/tests/testthat/testdata/erroneousguides/missing_plate_format.yml
@@ -36,8 +36,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
diff --git a/tests/testthat/testdata/guide_competition_1_0.yml b/tests/testthat/testdata/guide_competition_1_0.yml
@@ -37,8 +37,6 @@ locations:
     type: platedata
     translate: false
     atomicclass:
-      - character
-      - integer
       - character
       - numeric
       - numeric
