Skip to content

Commit

Permalink
removed ported oaqc code
Browse files Browse the repository at this point in the history
  • Loading branch information
schochastics committed Nov 18, 2024
1 parent 8f01058 commit de5d7c0
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 1,100 deletions.
11 changes: 4 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
Package: graphlayouts
Title: Additional Layout Algorithms for Network Visualizations
Version: 1.2.0.9000
Authors@R: c(
person("David", "Schoch", email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-2952-4812")),
person("Mark", "Ortmann", role = "ctb", comment = "author of R package oaqc"),
person("Felix", "Schoenenberger", role = "ctb", comment = "author of R package oaqc")
)
Authors@R: person("David", "Schoch", email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-2952-4812"))
Description: Several new layout algorithms to visualize networks are provided which are not part of 'igraph'.
Most are based on the concept of stress majorization by Gansner et al. (2004) <doi:10.1007/978-3-540-31843-9_25>.
Some more specific algorithms allow the user to emphasize hidden group structures in networks or focus on specific nodes.
Expand All @@ -22,7 +18,8 @@ Imports:
Suggests:
testthat,
ggplot2,
uwot
uwot,
oaqc
LinkingTo:
Rcpp,
RcppArmadillo
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export(layout_with_sparse_stress)
export(layout_with_stress)
export(layout_with_stress3D)
export(layout_with_umap)
export(oaqc)
export(reorder_edges)
importFrom(Rcpp,sourceCpp)
useDynLib(graphlayouts, .registration = TRUE)
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# graphlayouts (development version)
# graphlayouts 1.2.0.9000

* moves oaqc back to suggested packages and removed ported code

# graphlayouts 1.2.0

Expand Down
6 changes: 4 additions & 2 deletions R/layout_backbone.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@

layout_as_backbone <- function(g, keep = 0.2, backbone = TRUE) {
ensure_igraph(g)

if (!requireNamespace("oaqc", quietly = TRUE)) {
stop("oaqc is needed for this function to work. Please install it.", call. = FALSE)
}
if (igraph::ecount(g) == 0) {
stop("graph is empty")
}
Expand All @@ -45,7 +47,7 @@ layout_as_backbone <- function(g, keep = 0.2, backbone = TRUE) {
}

# weighting ----
orbs <- oaqc(igraph::as_edgelist(g, names = FALSE) - 1, non_ind_freq = T)
orbs <- oaqc::oaqc(igraph::as_edgelist(g, names = FALSE) - 1, non_ind_freq = TRUE)
e11 <- orbs$e_orbits_non_ind[, 11]

qu <- rep(0, igraph::vcount(g))
Expand Down
97 changes: 0 additions & 97 deletions R/oaqc.R

This file was deleted.

22 changes: 0 additions & 22 deletions man/annotate_result.Rd

This file was deleted.

19 changes: 0 additions & 19 deletions man/as.edge_list.Rd

This file was deleted.

6 changes: 0 additions & 6 deletions man/graphlayouts-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 0 additions & 33 deletions man/oaqc.Rd

This file was deleted.

109 changes: 0 additions & 109 deletions src/Graph.cpp

This file was deleted.

Loading

0 comments on commit de5d7c0

Please sign in to comment.