Skip to content

Commit 7c36ea9

Browse files
committed
New dev version.
1 parent ebae1f7 commit 7c36ea9

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: flownet
22
Type: Package
33
Title: Transport Modeling: Network Processing, Route Enumeration, and Traffic Assignment
4-
Version: 0.2.1
4+
Version: 0.2.1.9000
55
Authors@R: c(person("Sebastian", "Krantz", email = "sebastian.krantz@graduateinstitute.ch", role = c("aut", "cre")),
66
person("Kamol", "Roy", role = "ctb"))
77
Description: High-performance tools for transport modeling - network processing, route

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ importFrom(collapse,ckmatch)
3131
importFrom(collapse,collap)
3232
importFrom(collapse,colorder)
3333
importFrom(collapse,colorderv)
34+
importFrom(collapse,copyv)
3435
importFrom(collapse,dapply)
3536
importFrom(collapse,descr)
3637
importFrom(collapse,fduplicated)

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# flownet 0.2.1.9000
2+
3+
- Fixed issue in `consolidate_graph()` which used to modify columns (`from` and `to` in-place). Users in older versions are advised to input a `data.table::copy()` of the graph to retain it.
4+
15
# flownet 0.2.1
26

37
- `angle.max` constraint in `run_assignment()` is now two-sided (angle measured from origin and destination node against the straight line between them), rather than just one-sided (from origin). Also, the implementation is slightly more efficient.

R/utils.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ normalize_graph <- function(graph_df) {
448448
#' c(original = nrow(graph), consolidated = nrow(graph_cons))
449449
#'
450450
#' @export
451-
#' @importFrom collapse fnrow get_vars anyv setv ss seq_row fduplicated fmatch whichv whichNA allNA ffirst GRP collap %iin% %!in% %!iin% join colorderv funique.default %!=% %==% missing_cases qtab varying radixorderv groupv na_rm
451+
#' @importFrom collapse fnrow get_vars anyv setv copyv ss seq_row fduplicated fmatch whichv whichNA allNA ffirst GRP collap %iin% %!in% %!iin% join colorderv funique.default %!=% %==% missing_cases qtab varying radixorderv groupv na_rm
452452
#' @importFrom kit countOccur
453453
#' @importFrom stats setNames
454454
consolidate_graph <- function(graph_df, directed = FALSE,
@@ -541,7 +541,7 @@ consolidate_graph_core <- function(graph_df, directed = FALSE,
541541
reci, nam_keep, verbose = TRUE) {
542542

543543
keep <- seq_row(graph_df) # Global variable tracking utilized edges
544-
gft <- get_vars(graph_df, c("from", "to", by)) |> unclass() # Local variable representing the current graph worked on
544+
gft <- get_vars(graph_df, c("from", "to", by)) |> unclass() |> copyv(NA, NA) # Local variable representing the current graph worked on
545545

546546
if(length(by)) {
547547
by_id <- groupv(get_vars(graph_df, by))

0 commit comments

Comments
 (0)