Skip to content

Commit

Permalink
Merge pull request #11 from ropensci/igraph
Browse files Browse the repository at this point in the history
refactor: use .from()and .to() as from() and to() are depreca…
  • Loading branch information
FilipeamTeixeira authored Sep 10, 2024
2 parents 255d83a + 0bde6c4 commit b667d23
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version: 1.4.3
Title: Generates Networks from BTS Data
Authors@R: person("Filipe", "Teixeira", email = "Filipe.MarquesTeixeira@Ugent.be", role = c("aut", "cre"))
Maintainer: Filipe Teixeira <Filipe.MarquesTeixeira@Ugent.be>
URL: https://github.com/ropensci/skynet
URL: https://github.com/ropensci/skynet
Description: A flexible tool that allows generating bespoke
air transport statistics for urban studies based on publicly available
data from the Bureau of Transport Statistics (BTS) in the United States
Expand All @@ -13,7 +13,7 @@ License: MIT + file LICENSE
BugReports: https://github.com/ropensci/skynet/issues
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.1
RoxygenNote: 7.3.2
Collate:
'PowerLaw.R'
'createNodes.R'
Expand Down Expand Up @@ -53,11 +53,11 @@ Imports:
ggplot2,
ggrepel,
stringr,
maps,
httr,
geosphere,
leaflet,
RCurl
RCurl,
maps
Suggests:
knitr,
rmarkdown,
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ importFrom(httr,progress)
importFrom(leaflet,addPolylines)
importFrom(leaflet,addProviderTiles)
importFrom(leaflet,leaflet)
importFrom(maps,map)
importFrom(stats,coef)
importFrom(stats,lm)
importFrom(utils,download.file)
Expand Down
4 changes: 2 additions & 2 deletions R/fromto.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ from_to_stats <- function(x, y, orig){
orig <- as.character(orig)

if(orig == "from")
sum(E(x)[from(V(x)[y])]$weight)
sum(E(x)[.from(V(x)[y])]$weight)

else
sum(E(x)[to(V(x)[y])]$weight)
sum(E(x)[.to(V(x)[y])]$weight)
}

fromto.stat <- function(...){
Expand Down
3 changes: 3 additions & 0 deletions R/plotMap.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#' net_map(network, pct = 10)
#' }
#'
# Import to avoid R CMD check NOTE
# skynet > ggplot2::border() > ggplot2::map_data() > maps::map()
#' @importFrom maps map
#' @export
#'

Expand Down

0 comments on commit b667d23

Please sign in to comment.