diff --git a/build/bibliography.md b/build/bibliography.md index c228f836..bc17859a 100644 --- a/build/bibliography.md +++ b/build/bibliography.md @@ -4,7 +4,7 @@ author: bibliography: - bibliography.bib csl: apa-numeric-superscript-brackets.csl -date: 2024-08-19 +date: 2025-01-04 title: "Discourse Network Analysis: Bibliography" --- diff --git a/dna/src/main/java/dna/Dna.java b/dna/src/main/java/dna/Dna.java index d1fc5147..ba690f72 100644 --- a/dna/src/main/java/dna/Dna.java +++ b/dna/src/main/java/dna/Dna.java @@ -17,8 +17,8 @@ public class Dna { public static Dna dna; public static Logger logger; public static Sql sql; - public static final String date = "2024-10-08"; - public static final String version = "3.0.11.2"; + public static final String date = "2025-01-05"; + public static final String version = "3.0.11.3"; public static final String operatingSystem = System.getProperty("os.name"); public static File workingDirectory = null; public static Gui gui; diff --git a/dna/src/main/java/export/Exporter.java b/dna/src/main/java/export/Exporter.java index a2c03ce2..d676cb18 100644 --- a/dna/src/main/java/export/Exporter.java +++ b/dna/src/main/java/export/Exporter.java @@ -3768,7 +3768,6 @@ public double[] evaluateBackboneSolution(String[] backboneEntities, int p) { return results; } -} /* * ============================================================================= diff --git a/rDNA/rDNA/DESCRIPTION b/rDNA/rDNA/DESCRIPTION index 9aa27312..e7bf94ab 100755 --- a/rDNA/rDNA/DESCRIPTION +++ b/rDNA/rDNA/DESCRIPTION @@ -51,4 +51,4 @@ BugReports: https://github.com/leifeld/dna/issues License: GPL-3 | file LICENSE Encoding: UTF-8 Language: en-US -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 diff --git a/rDNA/rDNA/man/as.matrix.dna_network_onemode.Rd b/rDNA/rDNA/man/as.matrix.dna_network_onemode.Rd index 0c5abb89..6cac8283 100644 --- a/rDNA/rDNA/man/as.matrix.dna_network_onemode.Rd +++ b/rDNA/rDNA/man/as.matrix.dna_network_onemode.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{as.matrix.dna_network_onemode} \alias{as.matrix.dna_network_onemode} \title{Convert a \code{dna_network_onemode} object to a matrix} diff --git a/rDNA/rDNA/man/as.matrix.dna_network_twomode.Rd b/rDNA/rDNA/man/as.matrix.dna_network_twomode.Rd index ab5aded5..3ecd03e3 100644 --- a/rDNA/rDNA/man/as.matrix.dna_network_twomode.Rd +++ b/rDNA/rDNA/man/as.matrix.dna_network_twomode.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{as.matrix.dna_network_twomode} \alias{as.matrix.dna_network_twomode} \title{Convert a \code{dna_network_twomode} object to a matrix} diff --git a/rDNA/rDNA/man/autoplot.dna_network.Rd b/rDNA/rDNA/man/autoplot.dna_network.Rd index 08141092..58e2d9f6 100644 --- a/rDNA/rDNA/man/autoplot.dna_network.Rd +++ b/rDNA/rDNA/man/autoplot.dna_network.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{autoplot.dna_network} \alias{autoplot.dna_network} \alias{autoplot.dna_network_onemode} diff --git a/rDNA/rDNA/man/dna_backbone.Rd b/rDNA/rDNA/man/dna_backbone.Rd index d5bae13d..4ef40ae8 100644 --- a/rDNA/rDNA/man/dna_backbone.Rd +++ b/rDNA/rDNA/man/dna_backbone.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_backbone.R \name{dna_backbone} \alias{dna_backbone} \alias{print.dna_backbone} diff --git a/rDNA/rDNA/man/dna_barplot.Rd b/rDNA/rDNA/man/dna_barplot.Rd index 06dce2f6..4ae40df9 100644 --- a/rDNA/rDNA/man/dna_barplot.Rd +++ b/rDNA/rDNA/man/dna_barplot.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_barplot.R \name{dna_barplot} \alias{dna_barplot} \alias{print.dna_barplot} diff --git a/rDNA/rDNA/man/dna_jar.Rd b/rDNA/rDNA/man/dna_jar.Rd index cfd8f3d5..95332728 100644 --- a/rDNA/rDNA/man/dna_jar.Rd +++ b/rDNA/rDNA/man/dna_jar.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/rDNA.R \name{dna_jar} \alias{dna_jar} -\title{Identify and/or download and install the correct DNA jar file} +\title{Find the DNA jar file} \usage{ dna_jar() } @@ -11,25 +11,19 @@ The file name of the jar file that matches the installed \pkg{rDNA} version, including full path. } \description{ -Identify and/or download and install the correct DNA jar file. +Find the DNA jar file in the library path or working directory. } \details{ -rDNA requires the installation of a DNA jar file to run properly. While it is -possible to store the jar file in the respective working directory, it is -preferable to install it in the rDNA library installation directory under -\code{java/}. The \code{dna_jar} function attempts to find the version of the -jar file that matches the installed \pkg{rDNA} version in the \code{java/} -sub-directory of the package library path and return the jar file name -including its full path. If this fails, it will try to find the jar file in -the current working directory and return its file name. If this fails as -well, it will attempt to download the matching jar file from GitHub and store -it in the library path and return its file name. If this fails, it will -attempt to store the downloaded jar file in the working directory and return -its file name. If this fails as well, it will clone the current DNA master -code from GitHub to a local temporary directory, build the jar file from -source, and attempt to store the built jar file in the library path or, if -this fails, in the working directory and return the file name of the jar -file. If all of this fails, an error message is thrown. +rDNA requires the installation of a DNA jar file to run properly. The jar +file is shipped with the rDNA package and is installed in the \code{java/} +directory of the package installation directory in the R library tree. The +version number of the jar file and the rDNA package must match for DNA and +rDNA to be able to work together. The \code{dna_jar} function looks for +the jar file in the package installation directory sub-directory and +returns its file name with its absolute path. If it cannot be found in the +installation directory, the function looks in the current working +directory. The function is also called by \code{\link{dna_init}} if the +location of the jar file is not provided explicitly. } \seealso{ Other startup: diff --git a/rDNA/rDNA/man/dna_multiclust.Rd b/rDNA/rDNA/man/dna_multiclust.Rd index 87ea34bc..537d3ee4 100644 --- a/rDNA/rDNA/man/dna_multiclust.Rd +++ b/rDNA/rDNA/man/dna_multiclust.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_multiclust.R \name{dna_multiclust} \alias{dna_multiclust} \alias{print.dna_multiclust} diff --git a/rDNA/rDNA/man/dna_network.Rd b/rDNA/rDNA/man/dna_network.Rd index e44579fd..000ec729 100644 --- a/rDNA/rDNA/man/dna_network.Rd +++ b/rDNA/rDNA/man/dna_network.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{dna_network} \alias{dna_network} \title{Compute and retrieve a network} diff --git a/rDNA/rDNA/man/dna_phaseTransitions.Rd b/rDNA/rDNA/man/dna_phaseTransitions.Rd index 3c8d1561..f745d938 100644 --- a/rDNA/rDNA/man/dna_phaseTransitions.Rd +++ b/rDNA/rDNA/man/dna_phaseTransitions.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_phaseTransitions.R \name{dna_phaseTransitions} \alias{dna_phaseTransitions} \alias{print.dna_phaseTransitions} diff --git a/rDNA/rDNA/man/dna_tidygraph.Rd b/rDNA/rDNA/man/dna_tidygraph.Rd index 1b67677a..cb0b4c70 100644 --- a/rDNA/rDNA/man/dna_tidygraph.Rd +++ b/rDNA/rDNA/man/dna_tidygraph.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{dna_tidygraph} \alias{dna_tidygraph} \title{Convert a DNA network into a \code{tbl_graph} or \code{graph} object} diff --git a/rDNA/rDNA/man/print.dna_network_onemode.Rd b/rDNA/rDNA/man/print.dna_network_onemode.Rd index b243ff63..d49009eb 100644 --- a/rDNA/rDNA/man/print.dna_network_onemode.Rd +++ b/rDNA/rDNA/man/print.dna_network_onemode.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{print.dna_network_onemode} \alias{print.dna_network_onemode} \title{Print a \code{dna_network_onemode} object} diff --git a/rDNA/rDNA/man/print.dna_network_twomode.Rd b/rDNA/rDNA/man/print.dna_network_twomode.Rd index 6ddbdb57..41866f10 100644 --- a/rDNA/rDNA/man/print.dna_network_twomode.Rd +++ b/rDNA/rDNA/man/print.dna_network_twomode.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/rDNA.R +% Please edit documentation in R/dna_network.R \name{print.dna_network_twomode} \alias{print.dna_network_twomode} \title{Print a \code{dna_network_twomode} object}