X-Git-Url: https://git.donarmstrong.com/?p=ape.git;a=blobdiff_plain;f=R%2Fevonet.R;h=7f6b45f7e4ad136c4ea1507cb88a0fe2d6241d89;hp=9dbaaa3d75db4e71f7cb1cdc7b5414c27baf0a4d;hb=b9e04a6e6af3beda74b916eda00b42ac38875563;hpb=22bfb51d0260544b61b4bdfbd8e039d52b540617 diff --git a/R/evonet.R b/R/evonet.R index 9dbaaa3..7f6b45f 100644 --- a/R/evonet.R +++ b/R/evonet.R @@ -1,8 +1,8 @@ -## evonet.R (2011-06-09) +## evonet.R (2012-09-14) ## Evolutionary Networks -## Copyright 2011 Emmanuel Paradis +## Copyright 2011-2012 Emmanuel Paradis ## This file is part of the R-package `ape'. ## See the file ../COPYING for licensing issues. @@ -67,7 +67,7 @@ as.networx.evonet <- function(x, weight = NA, ...) { if (any(x$reticulation <= Ntip(x))) stop("some tips are involved in reticulations: cannot convert to \"networx\"") - x <- reorder(x, "p") + x <- reorder(x, "pruningwise") ned <- Nedge(x) nrt <- nrow(x$reticulation) x$edge <- rbind(x$edge, x$reticulation)