nvertices.igraph fixes vcount mode

* used to be an int, now numeric with igraph 2.0
natverse · Jan 31, 2024 · ee4a57b · ee4a57b
1 parent a98ced2
commit ee4a57b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -114,6 +114,7 @@ S3method(ndigest,neuron)
 S3method(ndigest,neuronlistfh)
 S3method(nvertices,default)
 S3method(nvertices,dotprops)
+S3method(nvertices,igraph)
 S3method(nvertices,neuron)
 S3method(nvertices,neuronlist)
 S3method(nvertices,shapelist3d)

diff --git a/R/neuron.R b/R/neuron.R
@@ -290,7 +290,7 @@ as.neuron.ngraph<-function(x, vertexData=NULL, origin=NULL, Verbose=FALSE, ...){
 
   d=seglist2swc(x=subtrees,d=d)
   d=normalise_swc(d)
-  n=list(d=d,NumPoints=igraph::vcount(masterg),
+  n=list(d=d,NumPoints=nvertices(masterg),
          StartPoint=StartPoint,
          BranchPoints=branchpoints(masterg, original.ids='vid'),
          EndPoints=endpoints(masterg, original.ids='vid'),

diff --git a/R/xform.R b/R/xform.R
@@ -230,6 +230,13 @@ xform.neuronlist<-function(x, reg, subset=NULL, ..., OmitFailures=NA,
 }
 
 
+#' @rdname nvertices
+#' @export
+nvertices.igraph <- function(x, ...) {
+  # as of igraph 2.0 this is numeric
+  as.integer(igraph::vcount(x))
+}
+
 #' Mirror 3D object about a given axis, optionally using a warping registration
 #' 
 #' @description mirroring with a warping registration can be used to account 

diff --git a/man/nvertices.Rd b/man/nvertices.Rd