diff --git a/DESCRIPTION b/DESCRIPTION index ccd618b..a9a62f5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,8 +5,8 @@ Description: Methods for the generation of a wide range of network geographies, e.g., grid networks or clustered networks. Useful for the generation of benchmarking instances for the investigation of, e.g., Vehicle-Routing-Problems or Travelling Salesperson Problems. -Version: 1.3.2 -Date: 2020-01-08 +Version: 1.4.0 +Date: 2023-02-06 Authors@R: c(person("Jakob", "Bossek", email = "j.bossek@gmail.com", role = c("aut", "cre"))) Maintainer: Jakob Bossek @@ -26,6 +26,6 @@ Suggests: testthat, lpSolve, covr -LazyData: yes ByteCompile: yes -RoxygenNote: 7.1.1 +RoxygenNote: 7.3.0 +Encoding: UTF-8 diff --git a/NEWS b/NEWS index 7aeb178..e613f38 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -netgen v1.4.xxxx (Release data: xxxx-xx-xx): +netgen v1.4.0 (Release data: xxxx-xx-xx): =========== * Networks now have additional optional slots opt.tour.length and opt.tour for diff --git a/R/exportToTSPlibFormat.R b/R/exportToTSPlibFormat.R index 6f4a9a6..7f46be7 100644 --- a/R/exportToTSPlibFormat.R +++ b/R/exportToTSPlibFormat.R @@ -20,7 +20,7 @@ #' Use the \dQuote{extended tsplib format} with additional information like cluster #' membership and bounds? Default is \code{TRUE}. #' @param full.matrix [\code{logical(1)}]\cr -#' Make use of \dQuote{FULL\_MATRIX} \dQuote{EDGE\_WEIGHT\_FORMAT} instead of +#' Make use of \dQuote{FULL_MATRIX} \dQuote{EDGE_WEIGHT_FORMAT} instead of #' node coordinates? #' Default is \code{FALSE}. #' @param digits [\code{integer(1)}]\cr diff --git a/R/generateClusterCenters.R b/R/generateClusterCenters.R index 84a0f6e..d0dacb5 100644 --- a/R/generateClusterCenters.R +++ b/R/generateClusterCenters.R @@ -15,7 +15,7 @@ # Cluster center matrix. Each row contains the coordinates of one cluster center. generateClusterCenters = function( n.cluster = 5L, n.dims = 2L, - generator = lhs:::maximinLHS, + generator = lhs::maximinLHS, lower = 0, upper = 1) { # FIXME: introduce use of min.dist.to.bounds cc = generator(n.cluster, n.dims) diff --git a/R/makeNetwork.R b/R/makeNetwork.R index 9ad4bc1..a3cfedd 100644 --- a/R/makeNetwork.R +++ b/R/makeNetwork.R @@ -29,8 +29,8 @@ #' @param edge.weight.type [\code{character(1)} | \code{NULL}] #' The edge weight type indicates how edge weights are represented in the TSPlib #' format. If \code{distance.matrix} is \code{NULL}, the passed value is ignored -#' and EUC\_2D is assigned. Otherwise the edge weight type must be one of the -#' following \code{{EUC\_2D, EUC\_3D, MAX\_2D, MAX\_3D, MAN\_2D, MAN\_3D, CEIL\_2D, +#' and EUC_2D is assigned. Otherwise the edge weight type must be one of the +#' following \code{{EUC_2D, EUC_3D, MAX_2D, MAX_3D, MAN_2D, MAN_3D, CEIL_2D, #' GEO, ATT, EXPLICIT}}. #' @param node.weights [\code{numeric}]\cr #' Vector of node weights (for weighted version of TSP). Default is \code{NULL}, diff --git a/man/exportToTSPlibFormat.Rd b/man/exportToTSPlibFormat.Rd index 27242eb..bb1aed3 100644 --- a/man/exportToTSPlibFormat.Rd +++ b/man/exportToTSPlibFormat.Rd @@ -36,7 +36,7 @@ Use the \dQuote{extended tsplib format} with additional information like cluster membership and bounds? Default is \code{TRUE}.} \item{full.matrix}{[\code{logical(1)}]\cr -Make use of \dQuote{FULL\_MATRIX} \dQuote{EDGE\_WEIGHT\_FORMAT} instead of +Make use of \dQuote{FULL_MATRIX} \dQuote{EDGE_WEIGHT_FORMAT} instead of node coordinates? Default is \code{FALSE}.} diff --git a/man/makeNetwork.Rd b/man/makeNetwork.Rd index 8141b00..ab7d93a 100644 --- a/man/makeNetwork.Rd +++ b/man/makeNetwork.Rd @@ -38,8 +38,8 @@ Optional vector of memberships for clustered networks.} \item{edge.weight.type}{[\code{character(1)} | \code{NULL}] The edge weight type indicates how edge weights are represented in the TSPlib format. If \code{distance.matrix} is \code{NULL}, the passed value is ignored -and EUC\_2D is assigned. Otherwise the edge weight type must be one of the -following \code{{EUC\_2D, EUC\_3D, MAX\_2D, MAX\_3D, MAN\_2D, MAN\_3D, CEIL\_2D, +and EUC_2D is assigned. Otherwise the edge weight type must be one of the +following \code{{EUC_2D, EUC_3D, MAX_2D, MAX_3D, MAN_2D, MAN_3D, CEIL_2D, GEO, ATT, EXPLICIT}}.} \item{depot.coordinates}{[\code{matrix} | \code{NULL}]\cr