Skip to content

Commit

Permalink
fix warning on cran checks
Browse files Browse the repository at this point in the history
  • Loading branch information
mpadge committed Apr 1, 2022
1 parent a7a05f5 commit 3a7d294
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dodgr
Title: Distances on Directed Graphs
Version: 0.2.12.047
Version: 0.2.12.048
Authors@R: c(
person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
person("Andreas", "Petutschnig", role = "aut"),
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Minor changes:
- Slightly extend categorical routing vignette
- fix caching bug in dodgr_centrality (#138), thanks to @mem48
- Fix bug with bbox in `dodgr_streetnet`, thanks to @LeshunXu (#174)
- Fix bug in src/graph-contract.cpp that led to CRAN warning (`|` -> `||`)

# v 0.2.12

Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"codeRepository": "https://github.com/ATFutures/dodgr",
"issueTracker": "https://github.com/ATFutures/dodgr/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.2.12.047",
"version": "0.2.12.048",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down
7 changes: 3 additions & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# CRAN notes for dodgr_0.2.12 submission

This submission rectifies the errors generated by the previous submission on
some systems. They were due to inadvertent inclusion of an OS-specific C++
header file. That header has now been removed. The single https redirect has
also been rectified.
This submission rectifies the warnings and errors generated by the previous submission on some systems, including:
1. Replacing the bitwise with boolean operator in src code


## Notes

Expand Down
2 changes: 1 addition & 1 deletion src/graph-contract.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void graph_contract::contract_graph (vertex_map_t &vertex_map,
// It is possible to have repeated values of two_nbs;
// calling these a second time should then just lead to no
// contraction
if ((vt_from == "") | (vt_to == ""))
if ((vt_from == "") || (vt_to == ""))
continue;

graph_contract::contract_one_edge (vert2edge_map,
Expand Down

0 comments on commit 3a7d294

Please sign in to comment.