Skip to content

Commit

Permalink
Working on viz defaults, now centering all on igraph::plot
Browse files Browse the repository at this point in the history
  • Loading branch information
gvegayon committed Sep 19, 2017
1 parent c1044ac commit cd1950d
Show file tree
Hide file tree
Showing 36 changed files with 474 additions and 286 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2017-09-18 George G. Vega Yon <[email protected]>
* R/diffnet-methods.r: Rewritten plot functions.
* R/misc.r: New function to set size according to degree.
* R/igraph.r: New set of functions and default (aesthetics).


2017-09-15 George G. Vega Yon <[email protected]>
* R/diffnet-methods.r: Making the coding more neat.
* R/plot_diffnet2.r: Changing defaults
Expand Down
5 changes: 4 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ S3method(as_dgCMatrix,array)
S3method(as_dgCMatrix,default)
S3method(as_dgCMatrix,diffnet)
S3method(as_dgCMatrix,igraph)
S3method(as_dgCMatrix,list)
S3method(as_dgCMatrix,network)
S3method(as_diffnet,default)
S3method(as_diffnet,networkDynamic)
Expand Down Expand Up @@ -110,6 +111,7 @@ export(graph_power)
export(grid_distribution)
export(hazard_rate)
export(igraph_to_diffnet)
export(igraph_vertex_rescale)
export(infection)
export(isolated)
export(leader_matching)
Expand Down Expand Up @@ -165,6 +167,7 @@ export(transformGraphBy)
export(vertex_covariate_compare)
export(vertex_covariate_dist)
export(vertex_mahalanobis_dist)
export(vertex_rescale_igraph)
export(weighted_var)
export(wvar)
import(methods)
Expand All @@ -183,6 +186,7 @@ importFrom(grDevices,colorRampPalette)
importFrom(grDevices,grey)
importFrom(grDevices,rgb)
importFrom(graphics,.filled.contour)
importFrom(graphics,box)
importFrom(graphics,grid)
importFrom(graphics,hist)
importFrom(graphics,image)
Expand Down Expand Up @@ -225,7 +229,6 @@ importFrom(networkDynamic,network.collapse)
importFrom(networkDynamic,network.extract)
importFrom(networkDynamic,networkDynamic)
importFrom(sna,as.sociomatrix.sna)
importFrom(sna,gplot)
importFrom(stats,as.formula)
importFrom(stats,coef)
importFrom(stats,complete.cases)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
* `rdiffnet` now allows passing scalars for `threshold.dist`, more over, the user
can also ask the function to just warn when there is no diffusion instead of
returning with error.

* `plot.diffnet`, `plot_diffnet`, `plot.diffnet_mentor`, and `plot_diffnet2` use igraph for plotting.
Also, users can now pass "degree" for -vertex.size- (vertex.cex not used anymore),
allowing to "automatically" scale vertices by (in/out/.)degree.


## Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion R/adjmat.r
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ simmelian_mat <- function(graph, ...) {
#' approx_geodesic(g, 6)
#' sna::geodist(as.matrix(g))[[2]]
#' igraph::distances(
#' igraph::graph_from_adjacency_matrix(g),
#' igraph::graph_from_adjacency_matrix(g, mode = "directed"),
#' mode = "out"
#' )
#'
Expand Down
Loading

0 comments on commit cd1950d

Please sign in to comment.