add site and mutation table rows

RcppTskit/NEWS.md

@@ -35,6 +35,11 @@ and releases adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html
   to append node rows from \code{R}, mirroring `tsk_node_table_add_row()`.
 - Added `rtsk_edge_table_add_row()` and `TableCollection$edge_table_add_row()`
   to append edge rows from \code{R}, mirroring `tsk_edge_table_add_row()`.
+- Added `rtsk_site_table_add_row()` and `TableCollection$site_table_add_row()`
+  to append site rows from \code{R}, mirroring `tsk_site_table_add_row()`.
+- Added `rtsk_mutation_table_add_row()` and
+  `TableCollection$mutation_table_add_row()` to append mutation rows from
+  \code{R}, mirroring `tsk_mutation_table_add_row()`.
 - TODO
 
 ### Changed

RcppTskit/R/Class-TableCollection.R

@@ -367,6 +367,75 @@ TableCollection <- R6Class(
       rtsk_table_collection_get_num_sites(self$xptr)
     },
 
+    #' @description Add a row to the sites table.
+    #' @param position numeric scalar site position.
+    #' @param ancestral_state for the new site; accepts \code{NULL},
+    #'   a raw vector, or a character of length 1.
+    #' @param metadata for the new site; accepts \code{NULL},
+    #'   a raw vector, or a character of length 1.
+    #' @details See the \code{tskit Python} equivalent at
+    #'   \url{https://tskit.dev/tskit/docs/stable/python-api.html#tskit.SiteTable.add_row}.
+    #'   The function casts inputs to the expected class. \code{position}
+    #'   must be a non-\code{NA} finite numeric scalar.
+    #' @return Integer row ID (0-based) of the newly added site.
+    #' @examples
+    #' ts_file <- system.file("examples/test.trees", package = "RcppTskit")
+    #' tc <- tc_load(ts_file)
+    #' n_before <- tc$num_sites()
+    #' new_id <- tc$site_table_add_row(position = 0.5, ancestral_state = "A")
+    #' new_id <- tc$site_table_add_row(position = 1.5, ancestral_state = charToRaw("G"))
+    #' new_id <- tc$site_table_add_row(position = 2.5, ancestral_state = "T", metadata = "abc")
+    #' n_after <- tc$num_sites()
+    site_table_add_row = function(
+      position,
+      ancestral_state = NULL,
+      metadata = NULL
+    ) {
+      if (
+        is.null(position) ||
+          length(position) != 1L ||
+          !is.numeric(position) ||
+          is.na(position) ||
+          !is.finite(position)
+      ) {
+        stop("position must be a non-NA finite numeric scalar!")
+      }
+      if (is.null(ancestral_state)) {
+        ancestral_state_raw <- NULL
+      } else if (is.raw(ancestral_state)) {
+        ancestral_state_raw <- ancestral_state
+      } else if (
+        is.character(ancestral_state) &&
+          length(ancestral_state) == 1L &&
+          !is.na(ancestral_state)
+      ) {
+        ancestral_state_raw <- charToRaw(ancestral_state)
+      } else {
+        stop(
+          "ancestral_state must be NULL, a raw vector, or a length-1 non-NA character string!"
+        )
+      }
+      if (is.null(metadata)) {
+        metadata_raw <- NULL
+      } else if (is.raw(metadata)) {
+        metadata_raw <- metadata
+      } else if (
+        is.character(metadata) && length(metadata) == 1L && !is.na(metadata)
+      ) {
+        metadata_raw <- charToRaw(metadata)
+      } else {
+        stop(
+          "metadata must be NULL, a raw vector, or a length-1 non-NA character string!"
+        )
+      }
+      rtsk_site_table_add_row(
+        tc = self$xptr,
+        position = as.numeric(position),
+        ancestral_state = ancestral_state_raw,
+        metadata = metadata_raw
+      )
+    },
+
     #' @description Get the number of mutations in a table collection.
     #' @return A signed 64 bit integer \code{bit64::integer64}.
     #' @examples
@@ -377,6 +446,104 @@ TableCollection <- R6Class(
       rtsk_table_collection_get_num_mutations(self$xptr)
     },
 
+    #' @description Add a row to the mutations table.
+    #' @param site integer scalar site row ID (0-based).
+    #' @param node integer scalar node row ID (0-based).
+    #' @param parent integer scalar parent mutation row ID (0-based, or \code{-1}).
+    #' @param time numeric scalar mutation time; use \code{NaN} for
+    #'   \code{TSK_UNKNOWN_TIME}.
+    #' @param derived_state for the new mutation; accepts \code{NULL},
+    #'   a raw vector, or a character of length 1.
+    #' @param metadata for the new mutation; accepts \code{NULL},
+    #'   a raw vector, or a character of length 1.
+    #' @details See the \code{tskit Python} equivalent at
+    #'   \url{https://tskit.dev/tskit/docs/stable/python-api.html#tskit.MutationTable.add_row}.
+    #'   The function casts inputs to the expected class. \code{site},
+    #'   \code{node}, and \code{parent} must be non-\code{NA} integer scalars.
+    #'   \code{time} must be a numeric scalar that is finite or \code{NaN}
+    #'   (unknown time).
+    #' @return Integer row ID (0-based) of the newly added mutation.
+    #' @examples
+    #' ts_file <- system.file("examples/test.trees", package = "RcppTskit")
+    #' tc <- tc_load(ts_file)
+    #' n_before <- tc$num_mutations()
+    #' new_id <- tc$mutation_table_add_row(site = 0L, node = 0L, derived_state = "T")
+    #' new_id <- tc$mutation_table_add_row(
+    #'   site = 0L,
+    #'   node = 0L,
+    #'   parent = -1L,
+    #'   time = 1.5,
+    #'   derived_state = charToRaw("C"),
+    #'   metadata = "abc"
+    #' )
+    #' n_after <- tc$num_mutations()
+    mutation_table_add_row = function(
+      site,
+      node,
+      parent = -1L,
+      time = NaN,
+      derived_state = NULL,
+      metadata = NULL
+    ) {
+      if (is.null(site) || length(site) != 1L || is.na(as.integer(site))) {
+        stop("site must be a non-NA integer scalar!")
+      }
+      if (is.null(node) || length(node) != 1L || is.na(as.integer(node))) {
+        stop("node must be a non-NA integer scalar!")
+      }
+      if (
+        is.null(parent) || length(parent) != 1L || is.na(as.integer(parent))
+      ) {
+        stop("parent must be a non-NA integer scalar!")
+      }
+      if (
+        is.null(time) ||
+          length(time) != 1L ||
+          !is.numeric(time) ||
+          (is.na(time) && !is.nan(time)) ||
+          !(is.finite(time) || is.nan(time))
+      ) {
+        stop("time must be a non-NA numeric scalar that is finite or NaN!")
+      }
+      if (is.null(derived_state)) {
+        derived_state_raw <- NULL
+      } else if (is.raw(derived_state)) {
+        derived_state_raw <- derived_state
+      } else if (
+        is.character(derived_state) &&
+          length(derived_state) == 1L &&
+          !is.na(derived_state)
+      ) {
+        derived_state_raw <- charToRaw(derived_state)
+      } else {
+        stop(
+          "derived_state must be NULL, a raw vector, or a length-1 non-NA character string!"
+        )
+      }
+      if (is.null(metadata)) {
+        metadata_raw <- NULL
+      } else if (is.raw(metadata)) {
+        metadata_raw <- metadata
+      } else if (
+        is.character(metadata) && length(metadata) == 1L && !is.na(metadata)
+      ) {
+        metadata_raw <- charToRaw(metadata)
+      } else {
+        stop(
+          "metadata must be NULL, a raw vector, or a length-1 non-NA character string!"
+        )
+      }
+      rtsk_mutation_table_add_row(
+        tc = self$xptr,
+        site = as.integer(site),
+        node = as.integer(node),
+        parent = as.integer(parent),
+        time = as.numeric(time),
+        derived_state = derived_state_raw,
+        metadata = metadata_raw
+      )
+    },
+
     #' @description Get the sequence length.
     #' @return A numeric.
     #' @examples

RcppTskit/R/RcppExports.R

@@ -215,6 +215,14 @@ rtsk_edge_table_add_row <- function(tc, left, right, parent, child, metadata = N
     .Call(`_RcppTskit_rtsk_edge_table_add_row`, tc, left, right, parent, child, metadata)
 }
 
+rtsk_site_table_add_row <- function(tc, position, ancestral_state = NULL, metadata = NULL) {
+    .Call(`_RcppTskit_rtsk_site_table_add_row`, tc, position, ancestral_state, metadata)
+}
+
+rtsk_mutation_table_add_row <- function(tc, site, node, parent, time, derived_state = NULL, metadata = NULL) {
+    .Call(`_RcppTskit_rtsk_mutation_table_add_row`, tc, site, node, parent, time, derived_state, metadata)
+}
+
 test_tsk_bug_assert_c <- function() {
     invisible(.Call(`_RcppTskit_test_tsk_bug_assert_c`))
 }
@@ -259,3 +267,11 @@ test_rtsk_edge_table_add_row_forced_error <- function(tc) {
     invisible(.Call(`_RcppTskit_test_rtsk_edge_table_add_row_forced_error`, tc))
 }
 
+test_rtsk_site_table_add_row_forced_error <- function(tc) {
+    invisible(.Call(`_RcppTskit_test_rtsk_site_table_add_row_forced_error`, tc))
+}
+
+test_rtsk_mutation_table_add_row_forced_error <- function(tc) {
+    invisible(.Call(`_RcppTskit_test_rtsk_mutation_table_add_row_forced_error`, tc))
+}
+

RcppTskit/inst/WORDLIST

@@ -6,10 +6,15 @@ SLiM
 TableCollection
 TreeSequence
 Tskit
+arXiv
 bitmask
+cloneable
+com
 doi
 etc
 finaliser
+github
+HighlanderLab
 iyae
 kastore
 msprime

RcppTskit/inst/include/RcppTskit_public.hpp

@@ -68,5 +68,13 @@ int rtsk_node_table_add_row(
 int rtsk_edge_table_add_row(
     SEXP tc, double left, double right, int parent, int child,
     Rcpp::Nullable<Rcpp::RawVector> metadata = R_NilValue);
+int rtsk_site_table_add_row(
+    SEXP tc, double position,
+    Rcpp::Nullable<Rcpp::RawVector> ancestral_state = R_NilValue,
+    Rcpp::Nullable<Rcpp::RawVector> metadata = R_NilValue);
+int rtsk_mutation_table_add_row(
+    SEXP tc, int site, int node, int parent, double time,
+    Rcpp::Nullable<Rcpp::RawVector> derived_state = R_NilValue,
+    Rcpp::Nullable<Rcpp::RawVector> metadata = R_NilValue);
 
 #endif