Add node names to output of ccdr.run, update tests

Author: itsrainingdata

R/ccdrAlgorithm-main.R

@@ -227,8 +227,13 @@ ccdr_call <- function(data,
     #  See docs for SparseBlockMatrixR class for details.
     #
     for(k in seq_along(fit)){
+        ### Coerce sbm output to edgeList
         names(fit[[k]])[1] <- "edges" # rename 'sbm' slot to 'edges': After the next line, this slot will no longer be an SBM object
         fit[[k]]$edges <- sparsebnUtils::as.edgeList(fit[[k]]$edges) # Before coercion, li$edges is actually an SBM object
+
+        ### Add node names to output
+        fit[[k]] <- append(fit[[k]], list(names(data)), after = 1) # insert node names into second slot
+        names(fit[[k]])[2] <- "nodes"
     }
 
     fit <- lapply(fit, sparsebnUtils::sparsebnFit)    # convert everything to sparsebnFit objects

tests/testthat/helper-ccdrAlgorithm-generate_objects.R

@@ -4,8 +4,8 @@ library("sparsebnUtils") # Expose methods from sparsebnUtils for testing
 generate_fixed_data_frame <- function(){
     a0 <- c(0.8723517,  1.2659643,  0.6484813,  1.1892274,  0.4934170, -0.6602971)
     b0 <- c(-0.84539872,  1.29776453,  0.27604776,  0.99424489,  1.19389, -0.03904687)
-    c0 <- c(-0.04738671, -0.21364539, -0.45286873, -0.42745932, -0.96944, 0.41352986) 
-    d0 <- c( 1.0350479, 0.3385954, -0.2297281,  1.2739593,  0.96532, 1.3661716)  
+    c0 <- c(-0.04738671, -0.21364539, -0.45286873, -0.42745932, -0.96944, 0.41352986)
+    d0 <- c( 1.0350479, 0.3385954, -0.2297281,  1.2739593,  0.96532, 1.3661716)
     e0 <- c(-0.2284215, -1.6957715, -0.3839743,  1.1515736, -0.27543, 0.6542333)
     data.frame(a0,b0,c0,d0,e0)
 }
@@ -21,7 +21,7 @@ generate_empty_SparseBlockMatrixR <- function(){
 }
 
 generate_empty_sparsebnFit <- function(){
-    li <- list(edges = generate_empty_edgeList(), lambda = 1, nedge = 0, pp = 1, nn = 10, time = 1)
+    li <- list(edges = generate_empty_edgeList(), nodes = "test", lambda = 1, nedge = 0, pp = 1, nn = 10, time = 1)
     sparsebnUtils::sparsebnFit(li)
 }
 
@@ -90,7 +90,7 @@ generate_fixed_SparseBlockMatrixR <- function(){
 generate_fixed_sparsebnFit <- function(){
     # sbm <- generate_fixed_SparseBlockMatrixR()
     edges <- generate_fixed_edgeList()
-    sbf <- sparsebnUtils::sparsebnFit(list(edges = edges, lambda = 1.54, nedge = num.edges(edges), pp = num.nodes(edges), nn = 10, time = 1))
+    sbf <- sparsebnUtils::sparsebnFit(list(edges = edges, nodes = LETTERS[1:num.nodes(edges)], lambda = 1.54, nedge = num.edges(edges), pp = num.nodes(edges), nn = 10, time = 1))
 
     sbf
 }