Skip to content

Commit

Permalink
Deactivated backbone UI in DNA and rDNA for 3.0.9 release. Needs more…
Browse files Browse the repository at this point in the history
… work before it can be released.
  • Loading branch information
leifeld committed Jan 8, 2023
1 parent 4db14be commit 61cd240
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 306 deletions.
3 changes: 2 additions & 1 deletion dna/src/main/java/gui/MenuBar.java
Expand Up @@ -203,7 +203,8 @@ public MenuBar(ActionOpenDatabase actionOpenDatabase,

// export menu: open backbone exporter
JMenuItem backboneExporterItem = new JMenuItem(actionBackboneExporter);
exportMenu.add(backboneExporterItem);
// exportMenu.add(backboneExporterItem);
// TODO: add back in once finalized

// settings menu
JMenu settingsMenu = new JMenu("Settings");
Expand Down
4 changes: 0 additions & 4 deletions rDNA/NAMESPACE
Expand Up @@ -2,14 +2,10 @@

S3method(as.matrix,dna_network_onemode)
S3method(as.matrix,dna_network_twomode)
S3method(autoplot,dna_backbone)
S3method(autoplot,dna_barplot)
S3method(plot,dna_backbone)
S3method(print,dna_backbone)
S3method(print,dna_barplot)
S3method(print,dna_network_onemode)
S3method(print,dna_network_twomode)
export(dna_backbone)
export(dna_barplot)
export(dna_closeDatabase)
export(dna_getAttributes)
Expand Down
8 changes: 4 additions & 4 deletions rDNA/R/rDNA.R
Expand Up @@ -1327,7 +1327,7 @@ as.matrix.dna_network_twomode <- as.matrix.dna_network_onemode
#' @importFrom rJava .jcall
#' @importFrom rJava .jnull
#' @importFrom rJava J
#' @export
#' @noRd
dna_backbone <- function(penalty = 3.5,
iterations = 10000,
statementType = "DNA Statement",
Expand Down Expand Up @@ -1499,7 +1499,7 @@ dna_backbone <- function(penalty = 3.5,
#' @rdname dna_backbone
#' @importFrom graphics lines
#' @importFrom stats filter
#' @export
#' @noRd
plot.dna_backbone <- function(x, ma = 500, ...) {
# temperature and acceptance probability
plot(x = x$diagnostics$iteration,
Expand Down Expand Up @@ -1556,7 +1556,7 @@ plot.dna_backbone <- function(x, ma = 500, ...) {

#' @rdname dna_backbone
#' @param x A \code{"dna_backbone"} object.
#' @export
#' @noRd
print.dna_backbone <- function(x, ...) {
cat(paste0("Penalty: ", x$penalty, ". Iterations: ", x$iterations, ".\n\n"))
cat(paste0("Backbone set (loss: ", round(x$unpenalized_backbone_loss, 4), "):\n"))
Expand All @@ -1577,7 +1577,7 @@ print.dna_backbone <- function(x, ...) {
#' @importFrom ggplot2 ggtitle
#' @importFrom ggplot2 theme_bw
#' @importFrom ggplot2 theme
#' @export
#' @noRd
autoplot.dna_backbone <- function(object, ..., ma = 500) {
bd <- object$diagnostics
bd$bb_loss <- stats::filter(bd$penalized_backbone_loss, rep(1 / ma, ma), sides = 1)
Expand Down
297 changes: 0 additions & 297 deletions rDNA/man/dna_backbone.Rd

This file was deleted.

0 comments on commit 61cd240

Please sign in to comment.