From b5865393d52070ee2b1a78e8dff689d032d1cd66 Mon Sep 17 00:00:00 2001 From: Andrea Manica Date: Fri, 8 Dec 2023 04:42:44 +0000 Subject: [PATCH 1/2] Fix all references to new location of project --- R/accessors.R | 10 +++++----- R/auxil.R | 2 +- R/buffer.R | 2 +- R/classes.R | 4 ++-- R/closestNode.R | 2 +- R/connectivity.R | 2 +- R/dijkstra.R | 2 +- R/dropDead.R | 2 +- R/extractFromLayer.R | 2 +- R/findLand.R | 2 +- R/interact.R | 4 ++-- R/isInArea.R | 2 +- R/makeGrid.R | 2 +- R/plot.R | 4 ++-- R/setCosts.R | 2 +- R/setDistCosts.R | 2 +- README.md | 2 +- man/auxiliary.Rd | 3 --- man/buffer.Rd | 3 --- man/closestNode.Rd | 3 --- man/combineCosts.Rd | 6 +++--- man/connectivity.Rd | 3 --- man/dijkstra-methods.Rd | 3 --- man/dropDeadEdges.Rd | 3 --- man/extractFromLayer.Rd | 3 --- man/findLand.Rd | 3 --- man/gData-class.Rd | 3 --- man/gGraph-class.Rd | 3 --- man/geo.add.edges.Rd | 3 --- man/geo.change.attr.Rd | 3 --- man/getColors.Rd | 3 --- man/getCosts.Rd | 3 --- man/getEdges.Rd | 3 --- man/getNodesAttr.Rd | 3 --- man/isInArea.Rd | 3 --- man/makeGrid.Rd | 3 --- man/plot-gData.Rd | 3 --- man/plot-gGraph.Rd | 3 --- man/setCosts.Rd | 4 ---- man/setDistCosts.Rd | 3 --- man/setEdges.Rd | 3 --- 41 files changed, 27 insertions(+), 97 deletions(-) diff --git a/R/accessors.R b/R/accessors.R index 3a42fb2..f598aa5 100644 --- a/R/accessors.R +++ b/R/accessors.R @@ -63,7 +63,7 @@ setMethod("getGraph", "gData", function(x, ...) { #' @param \dots other arguments passed to other methods (currently unused). #' @return A data.frame with the requested nodes attributes. Nodes are #' displayed in rows, variables in columns. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso Most other accessors are documented in \linkS4class{gGraph} and #' \linkS4class{gData} manpages.\cr #' @keywords utilities methods @@ -221,7 +221,7 @@ setMethod("getNodes", "gData", function(x, ...) { #' #' - \code{matId}: a matrix with two columns giving couples of node indices #' forming edges.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso Most other accessors are documented in \linkS4class{gGraph} #' manpage.\cr #' @@ -305,7 +305,7 @@ setMethod("getEdges", "gGraph", function(x, res.type = c("asIs", "matNames", "ma #' \code{costs[i]} is the weight of the i-th edge. #' @param \dots other arguments passed to other methods (currently unused). #' @return A \linkS4class{gGraph} object with newly added or removed edges. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{geo.add.edges}} and \code{\link{geo.remove.edges}} to #' interactively add or remove edges in a \linkS4class{gGraph} object. \cr #' @@ -400,7 +400,7 @@ setMethod("setEdges", "gGraph", function(x, add = NULL, remove = NULL, costs = N #' #' - \code{vector}: a vector of weights; this output matches matrix outputs of #' \code{\link{getEdges}}.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso Most other accessors are documented in \linkS4class{gGraph} #' manpage.\cr #' @keywords utilities methods @@ -517,7 +517,7 @@ setMethod("getData", "gData", function(x, ...) { #' with different colors. See details. #' @param \dots other arguments passed to other methods. #' @return A vector of characters being valid colors.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @export #' @examples diff --git a/R/auxil.R b/R/auxil.R index 4b602b2..b9d2e3c 100644 --- a/R/auxil.R +++ b/R/auxil.R @@ -26,7 +26,7 @@ #' \code{segments} function. #' @return For \code{hasCost}, a logical value is returned. \code{geo.segments} #' returns NULL. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @name auxiliary #' @examples diff --git a/R/buffer.R b/R/buffer.R index 7737040..4889b2a 100644 --- a/R/buffer.R +++ b/R/buffer.R @@ -27,7 +27,7 @@ #' #' - \code{gData}: a \linkS4class{gData} object including all the nodes of the #' buffers.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @name buffer #' @examples diff --git a/R/classes.R b/R/classes.R index 48a9da7..260b040 100644 --- a/R/classes.R +++ b/R/classes.R @@ -47,7 +47,7 @@ NULL #' #' Note that none of these is mandatory: \code{new("gGraph")} would work, and #' create an empty \code{gGraph} object. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso Related classes are:\cr % - \code{\linkS4class{graphNEL}} #' (graph package): slot \code{@graph} in \code{gGraph}.\cr #' @keywords classes spatial graphs @@ -139,7 +139,7 @@ setClass( #' an empty \code{gGraph} object. Also note that a finer matching of locations #' against the nodes of a \code{gGraph} object can be achieved after creating #' the object, for instance using the \code{closestNode} method. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso Related class:\cr - \code{\linkS4class{gGraph}}\cr #' @examples #' diff --git a/R/closestNode.R b/R/closestNode.R index c16a248..2b72b03 100644 --- a/R/closestNode.R +++ b/R/closestNode.R @@ -38,7 +38,7 @@ #' If \code{x} is a \linkS4class{gData} object: a \linkS4class{gData} object #' with matching nodes stored in the \code{@nodes.id} slot. Note that previous #' content of \code{@nodes.id} will be erased.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{geo.add.edges}} and \code{\link{geo.remove.edges}} to #' interactively add or remove edges in a \linkS4class{gGraph} object. #' @keywords utilities methods diff --git a/R/connectivity.R b/R/connectivity.R index 18d5355..548e5bc 100644 --- a/R/connectivity.R +++ b/R/connectivity.R @@ -50,7 +50,7 @@ #' #' - \code{isConnected}: a single logical value, being TRUE if nodes of the #' object form a connected set.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @name connectivity #' @examples diff --git a/R/dijkstra.R b/R/dijkstra.R index e00454d..606f3e9 100644 --- a/R/dijkstra.R +++ b/R/dijkstra.R @@ -47,7 +47,7 @@ #' \code{sp.between} function (see \code{?sp.between}), with a class attribute #' set to "gPath", and an additional slot 'xy' containing geographic #' coordinates of the nodes involved in the paths.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords methods spatial #' @examples #' \dontrun{ diff --git a/R/dropDead.R b/R/dropDead.R index 4f88f7b..a239637 100644 --- a/R/dropDead.R +++ b/R/dropDead.R @@ -20,7 +20,7 @@ #' @param thres a numeric value indicating the threshold cost for an edge to be #' removed. All costs strictly greater than \code{thres} will be removed. #' @return A \linkS4class{gGraph} object. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @export #' @examples diff --git a/R/extractFromLayer.R b/R/extractFromLayer.R index 6d3a3e7..7b4cb12 100644 --- a/R/extractFromLayer.R +++ b/R/extractFromLayer.R @@ -40,7 +40,7 @@ #' - \code{gData}: a \linkS4class{gData} object with new data associated to #' locations (\code{@data} slot). New information is merge to older information #' according to the type of data being stored. \cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{findLand}}, to find which locations are on land. #' @keywords utilities methods #' @name extractFromLayer diff --git a/R/findLand.R b/R/findLand.R index a187d40..6de6300 100644 --- a/R/findLand.R +++ b/R/findLand.R @@ -28,7 +28,7 @@ #' - \code{gGraph}: a \linkS4class{gGraph} object with a new node attribute, #' possibly added to previously existing node attributes (\code{@nodes.attr} #' slot).\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{extractFromLayer}}, to retrieve any information from a #' GIS shapefile. #' @keywords utilities methods diff --git a/R/interact.R b/R/interact.R index 36908da..59a7824 100644 --- a/R/interact.R +++ b/R/interact.R @@ -28,7 +28,7 @@ NULL #' a character string can be provided, corresponding to one of the following #' datasets: 'rawgraph.10k', rawgraph.40k'. #' @return A \linkS4class{gGraph} object with newly added or removed edges. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{setEdges}} to non-interactively add or remove edges in #' a \linkS4class{gGraph} object. #' @keywords utilities @@ -276,7 +276,7 @@ geo.remove.edges <- function(x, mode = c("points", "area")) { #' reference when re-adding edges. If a character string is provided, it must #' match one of the following dataset: 'rawgraph.10k', 'rawgraph.40k'. #' @return A \linkS4class{gGraph} object with modified node attributes. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities #' @examples #' \dontrun{ diff --git a/R/isInArea.R b/R/isInArea.R index 0e6d8f7..96f0560 100644 --- a/R/isInArea.R +++ b/R/isInArea.R @@ -34,7 +34,7 @@ #' #' - \code{character}: a vector of characters corresponding to the names of the #' nodes falling within the area.\cr -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @export #' @examples diff --git a/R/makeGrid.R b/R/makeGrid.R index d58ad3f..08df089 100644 --- a/R/makeGrid.R +++ b/R/makeGrid.R @@ -21,7 +21,7 @@ #' @param lon.range,lat.range vectors of length two giving the range covered by #' the grid, in longitude and latitude, respectively. #' @return A \linkS4class{gGraph} object. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @keywords utilities methods #' @export #' @examples diff --git a/R/plot.R b/R/plot.R index dc9c5a2..bf2c565 100644 --- a/R/plot.R +++ b/R/plot.R @@ -57,7 +57,7 @@ #' \code{reset=TRUE} will prevent points to be redrawn. #' @param \dots further arguments passed to the generic methods (plot, points, #' and segments, respectively). -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso - Different functions to explore these plots:\cr #' \code{\link{geo.zoomin}}, \code{\link{geo.zoomout}}, #' \code{\link{geo.slide}}, \code{\link{geo.back}}.\cr @@ -563,7 +563,7 @@ plotEdges <- function(x, useCosts = NULL, col = "black", lwd = 1, #' when replotting (TRUE, default), or not (FALSE). In any case, #' \code{reset=TRUE} will prevent points to be redrawn. #' @param \dots further arguments passed to \code{points}. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso - Different functions to explore these plots:\cr #' \code{\link{geo.zoomin}}, \code{\link{geo.zoomout}}, #' \code{\link{geo.slide}}, \code{\link{geo.back}}, \code{\link{geo.bookmark}}, diff --git a/R/setCosts.R b/R/setCosts.R index 06245ed..763c1e6 100644 --- a/R/setCosts.R +++ b/R/setCosts.R @@ -34,7 +34,7 @@ #' @param \dots additional parameters to be passed to \code{FUN}. #' @return A \linkS4class{gGraph} object with the newly defined costs used as #' weightings of edges. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso \code{\link{dropDeadEdges}}, to get rid of edge whose cost is below #' a given threshold. \code{\link{geo.add.edges}} to add edges to a #' \linkS4class{gGraph} object. diff --git a/R/setDistCosts.R b/R/setDistCosts.R index 3e67b55..d0aea6f 100644 --- a/R/setDistCosts.R +++ b/R/setDistCosts.R @@ -17,7 +17,7 @@ #' @return For the \linkS4class{gGraph} method, a \linkS4class{gGraph} object #' with appropriate weights. Note that former weights will be removed from the #' object. -#' @author Thibaut Jombart (\email{t.jombart@@imperial.ac.uk}) + #' @seealso The \code{\link{getCosts}} accessor, returning costs of the edges #' of a \linkS4class{gGraph} object in different ways.\cr #' @keywords utilities methods diff --git a/README.md b/README.md index 199988f..b3eee41 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ You can install the development version of `geoGraph` from [GitHub](https://gith ``` r install.packages("devtools") -devtools::install_github("thibautjombart/geoGraph") +devtools::install_github("EvolEcolGroup/geograph/") ``` ## How the package works diff --git a/man/auxiliary.Rd b/man/auxiliary.Rd index f749b23..329fba0 100644 --- a/man/auxiliary.Rd +++ b/man/auxiliary.Rd @@ -60,9 +60,6 @@ segments between locations distant by more than 90 degrees of longitude.\cr hasCosts(worldgraph.10k) -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/buffer.Rd b/man/buffer.Rd index c7220ff..5dd8014 100644 --- a/man/buffer.Rd +++ b/man/buffer.Rd @@ -79,9 +79,6 @@ points(buf.400, col.node = "gold") points(buf.200, col.node = "orange") title("Different buffers for a gData \n(100km, 200km, 500km)") -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/closestNode.Rd b/man/closestNode.Rd index fe340a7..d0f6839 100644 --- a/man/closestNode.Rd +++ b/man/closestNode.Rd @@ -102,8 +102,5 @@ title("'x'=location, 'o'=assigned node") \code{\link{geo.add.edges}} and \code{\link{geo.remove.edges}} to interactively add or remove edges in a \linkS4class{gGraph} object. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/combineCosts.Rd b/man/combineCosts.Rd index ab92450..2245086 100644 --- a/man/combineCosts.Rd +++ b/man/combineCosts.Rd @@ -42,10 +42,10 @@ Also note that 'costs' defined in \code{geoGraph} are equivalent to data("worldgraph.40k") # new graph with custom cost function exp.cost <- function(x1, x2, cost.coeff) { - exp(-abs(x1 - x2) * cost.coeff) + exp(-abs(x1 - x2) * cost.coeff) } # create a set of node costs -worldgraph.40k@nodes.attr$meanProd<-runif(n=40962) +worldgraph.40k@nodes.attr$meanProd <- runif(n = 40962) new_costs_graph <- setCosts( worldgraph.40k, @@ -55,5 +55,5 @@ new_costs_graph <- cost.coeff = 0.5 ) # combine costs from the original graph with the new costs -combine_costs_graph<- combineCosts(worldgraph.40k, new_costs_graph, method="sum") +combine_costs_graph <- combineCosts(worldgraph.40k, new_costs_graph, method = "sum") } diff --git a/man/connectivity.Rd b/man/connectivity.Rd index 436a166..b1c183c 100644 --- a/man/connectivity.Rd +++ b/man/connectivity.Rd @@ -91,9 +91,6 @@ set of size > 1) are plotted in light grey. connectivityPlot(rawgraph.10k) connectivityPlot(worldgraph.10k) -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/dijkstra-methods.Rd b/man/dijkstra-methods.Rd index dd0bfe6..8bcfac1 100644 --- a/man/dijkstra-methods.Rd +++ b/man/dijkstra-methods.Rd @@ -113,9 +113,6 @@ points(data.frame(ori.coord), pch = "x", col = "black", cex = 3) # add origin plot(myPath) # plot the path } -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{spatial} diff --git a/man/dropDeadEdges.Rd b/man/dropDeadEdges.Rd index 2dc8d97..4e23ab4 100644 --- a/man/dropDeadEdges.Rd +++ b/man/dropDeadEdges.Rd @@ -34,9 +34,6 @@ x <- dropDeadNodes(worldgraph.10k) plot(x) } -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/extractFromLayer.Rd b/man/extractFromLayer.Rd index 7eb940b..83b2f35 100644 --- a/man/extractFromLayer.Rd +++ b/man/extractFromLayer.Rd @@ -95,8 +95,5 @@ plot(x, reset = TRUE) \seealso{ \code{\link{findLand}}, to find which locations are on land. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/findLand.Rd b/man/findLand.Rd index a513acd..f84d0a7 100644 --- a/man/findLand.Rd +++ b/man/findLand.Rd @@ -77,8 +77,5 @@ plot(obj) \code{\link{extractFromLayer}}, to retrieve any information from a GIS shapefile. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/gData-class.Rd b/man/gData-class.Rd index fcd8fb7..61dc31a 100644 --- a/man/gData-class.Rd +++ b/man/gData-class.Rd @@ -77,6 +77,3 @@ points(onlyNorth, pch.node = 20, cex = 2, col.node = "purple") \seealso{ Related class:\cr - \code{\linkS4class{gGraph}}\cr } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} diff --git a/man/gGraph-class.Rd b/man/gGraph-class.Rd index ec782b8..33b3ec7 100644 --- a/man/gGraph-class.Rd +++ b/man/gGraph-class.Rd @@ -97,9 +97,6 @@ title("after droping edges with null weight") Related classes are:\cr \% - \code{\linkS4class{graphNEL}} (graph package): slot \code{@graph} in \code{gGraph}.\cr } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{classes} \keyword{graphs} \keyword{spatial} diff --git a/man/geo.add.edges.Rd b/man/geo.add.edges.Rd index 9197a72..0706030 100644 --- a/man/geo.add.edges.Rd +++ b/man/geo.add.edges.Rd @@ -53,7 +53,4 @@ geo.add.edges(worldgraph.10k, mode = "area") # area mode \code{\link{setEdges}} to non-interactively add or remove edges in a \linkS4class{gGraph} object. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{utilities} diff --git a/man/geo.change.attr.Rd b/man/geo.change.attr.Rd index 8c3eb7e..a995be1 100644 --- a/man/geo.change.attr.Rd +++ b/man/geo.change.attr.Rd @@ -78,8 +78,5 @@ habitat", newCol = "purple", only.name = "habitat", only.value = "land") plot(x, reset = TRUE) # modification in the whole selected area } -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{utilities} diff --git a/man/getColors.Rd b/man/getColors.Rd index 7eca63f..c83b2d0 100644 --- a/man/getColors.Rd +++ b/man/getColors.Rd @@ -57,9 +57,6 @@ worldgraph.10k@meta$color head(getNodes(worldgraph.10k)) head(getColors(worldgraph.10k, res.type = "vector", attr.name = "habitat")) -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/getCosts.Rd b/man/getCosts.Rd index 0d6df6d..adea4d8 100644 --- a/man/getCosts.Rd +++ b/man/getCosts.Rd @@ -75,8 +75,5 @@ head(getCosts(worldgraph.10k, res.type = "vector", unique = TRUE)) Most other accessors are documented in \linkS4class{gGraph} manpage.\cr } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/getEdges.Rd b/man/getEdges.Rd index 2e6dfa7..5a581ed 100644 --- a/man/getEdges.Rd +++ b/man/getEdges.Rd @@ -59,8 +59,5 @@ See \code{\link{setEdges}} to add/remove edges, or \code{\link{geo.add.edges}} and \code{\link{geo.remove.edges}} for interactive versions. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/getNodesAttr.Rd b/man/getNodesAttr.Rd index 737cea1..329856a 100644 --- a/man/getNodesAttr.Rd +++ b/man/getNodesAttr.Rd @@ -55,8 +55,5 @@ getNodesAttr(hgdp) Most other accessors are documented in \linkS4class{gGraph} and \linkS4class{gData} manpages.\cr } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/isInArea.Rd b/man/isInArea.Rd index 3f78143..2f13b5c 100644 --- a/man/isInArea.Rd +++ b/man/isInArea.Rd @@ -111,9 +111,6 @@ head(isInArea(worldgraph.10k, res.type = "character")) # node names x <- worldgraph.10k[isInArea(worldgraph.10k)] plot(x, reset = TRUE) -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/makeGrid.Rd b/man/makeGrid.Rd index 73c57a8..1599049 100644 --- a/man/makeGrid.Rd +++ b/man/makeGrid.Rd @@ -54,9 +54,6 @@ newGraph@meta$colors <- data.frame( ## plot the new gGraph plot(newGraph, reset = TRUE, edge = TRUE) -} -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) } \keyword{methods} \keyword{utilities} diff --git a/man/plot-gData.Rd b/man/plot-gData.Rd index 6b2675f..bf5d723 100644 --- a/man/plot-gData.Rd +++ b/man/plot-gData.Rd @@ -118,9 +118,6 @@ points(obj, col.nodes = "yellow", cex = 4) \code{\link{geo.goto}}.\cr } } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{hplot} \keyword{methods} \keyword{spatial} diff --git a/man/plot-gGraph.Rd b/man/plot-gGraph.Rd index f181cca..12ddaa7 100644 --- a/man/plot-gGraph.Rd +++ b/man/plot-gGraph.Rd @@ -123,9 +123,6 @@ plot(worldgraph.10k[!inSea], bg.col = "darkgreen", col = "purple", edges = TRUE) \item \code{\link{isInArea}}, to retain a set of visible data.\cr } } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{hplot} \keyword{methods} \keyword{spatial} diff --git a/man/setCosts.Rd b/man/setCosts.Rd index 2398bac..55465e5 100644 --- a/man/setCosts.Rd +++ b/man/setCosts.Rd @@ -68,14 +68,10 @@ x <- setCosts(x, attr.name = "habitat") plot(x, edges = TRUE) title("costs defined by habitat (land/land=1, other=100)") - } \seealso{ \code{\link{dropDeadEdges}}, to get rid of edge whose cost is below a given threshold. \code{\link{geo.add.edges}} to add edges to a \linkS4class{gGraph} object. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{utilities} diff --git a/man/setDistCosts.Rd b/man/setDistCosts.Rd index 1005258..e6aa75a 100644 --- a/man/setDistCosts.Rd +++ b/man/setDistCosts.Rd @@ -60,8 +60,5 @@ if (require(fields)) { The \code{\link{getCosts}} accessor, returning costs of the edges of a \linkS4class{gGraph} object in different ways.\cr } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} diff --git a/man/setEdges.Rd b/man/setEdges.Rd index c2a9d11..56512c3 100644 --- a/man/setEdges.Rd +++ b/man/setEdges.Rd @@ -46,8 +46,5 @@ interactively add or remove edges in a \linkS4class{gGraph} object. \cr \code{\link{getEdges}} to retrieve edges in different formats. } -\author{ -Thibaut Jombart (\email{t.jombart@imperial.ac.uk}) -} \keyword{methods} \keyword{utilities} From 93d59564b8146960c2ce0936602fe23b67a2c9cc Mon Sep 17 00:00:00 2001 From: Andrea Manica Date: Fri, 8 Dec 2023 04:48:13 +0000 Subject: [PATCH 2/2] Update for main to be default branch --- .github/workflows/R-CMD-check.yaml | 2 +- .github/workflows/pkgdown.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 028258f..d7a73fd 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -2,7 +2,7 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, master, fix_check] + branches: [main, fix_check] pull_request: branches: [main, master] diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 1661077..0286127 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, master, dev] + branches: [main, dev] pull_request: - branches: [main, master, dev] + branches: [main, dev] release: types: [published] workflow_dispatch: