Merge branch 'master' into dev

# Conflicts:
#	r-package/inst/jar/r5r.jar

README.md

@@ -232,7 +232,6 @@ BibTeX:
 	shorttitle = {r5r},
 	url = {https://findingspress.org/article/21262-r5r-rapid-realistic-routing-on-multimodal-transport-networks-with-r-5-in-r},
 	doi = {10.32866/001c.21262},
-	abstract = {Routing is a key step in transport planning and research. Nonetheless, researchers and practitioners often face challenges when performing this task due to long computation times and the cost of licensed software. R{\textasciicircum}5{\textasciicircum} is a multimodal transport network router that offers multiple routing features, such as calculating travel times over a time window and returning multiple itineraries for origin/destination pairs. This paper describes r5r, an open-source R package that leverages R{\textasciicircum}5{\textasciicircum} to efficiently compute travel time matrices and generate detailed itineraries between sets of origins and destinations at no expense using seamless parallel computing.},
 	language = {en},
 	urldate = {2021-03-04},
 	journal = {Findings},

r-package/DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: r5r
 Title: Rapid Realistic Routing with 'R5'
-Version: 1.1.0
+Version: 1.1.0999
 Authors@R: c(
     person("Marcus", "Saraiva", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0001-6218-2338")),
@@ -13,6 +13,8 @@ Authors@R: c(
            comment = c(ORCID = "0000-0002-6104-7297")),
     person("Matthew Wigginton", "Bhagat-Conway", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0002-1210-2982")),
+    person("Luyu", "Liu", , "[email protected]", role = "ctb",
+           comment = c(ORCID = "0000-0002-6684-5570")),
     person("Ipea - Institute for Applied Economic Research", role = c("cph", "fnd"))
   )
 Description: Rapid realistic routing on multimodal transport networks

r-package/NEWS.md

@@ -1,3 +1,21 @@
+# r5r 1.1.0999 dev
+
+**Minor changes**
+
+- In the `accessibility()` function, the value of `max_trip_duration` is now capped by the max value passed to the `cutoffs` parameter. Closes [#342](https://github.com/ipeaGIT/r5r/issues/348).
+- Updated documentation of parameter `max_walk_time` to make it clear that in walk-only trips, whenever `max_walk_time` differs from `max_trip_duration`, the lowest value is considered. Closes [#353](https://github.com/ipeaGIT/r5r/issues/353)
+- Updated documentation of parameter `max_bike_time` to make it clear that in bicycle-only trips, whenever `max_bike_time` differs from `max_trip_duration`, the lowest value is considered. Closes [#353](https://github.com/ipeaGIT/r5r/issues/353)
+- Improved documentation of parameter `suboptimal_minutes` in the `detailed_itineraries()` function.
+- Updated the vignette on time window to explain how this parameter behaves when used in the `detailed_itineraries()` function.
+
+**Bug Fixes**
+- Fixed bug that prevented the using the `output_dir` parameter in the `detailed_itineraries(all_to_all = TRUE)` function. Closes [#327](https://github.com/ipeaGIT/r5r/issues/327) with a contribution ([PR #354](https://github.com/ipeaGIT/r5r/pull/354)) from Luyu Liu.
+- Fixed bug that prevented  `detailed_itineraries` from working with frequency-based GTFS feeds. It should ONLY work with frequency-based GTFS feeds.
+
+**New contributors to r5r**
+- [Luyu Liu](https://github.com/luyuliu)
+
+
 # r5r 1.1.0
 
 **Major changes**

r-package/R/detailed_itineraries.R

@@ -26,11 +26,14 @@
 #'   function: `vignette("time_window", package = "r5r")`.
 #' @param suboptimal_minutes A number. The difference in minutes that each
 #'   non-optimal RAPTOR branch can have from the optimal branch without being
-#'   disregarded by the routing algorithm. This argument emulates the real-life
-#'   behaviour that makes people want to take a path that is technically not
-#'   optimal (in terms of travel time, for example) for some practical reasons
-#'   (e.g. mode preference, safety, etc). In practice, the higher this value,
-#'   the more itineraries will be returned in the final result.
+#'   disregarded by the routing algorithm. If, for example, users set
+#'   `suboptimal_minutes = 10`, the routing algorithm will consider sub-optimal
+#'   routes that arrive up to 10 minutes after the arrival of the optimal one.
+#'   This argument emulates the real-life behaviour that makes people want to
+#'   take a path that is technically not optimal in terms of travel time, for
+#'   example, for some practical reasons (e.g. mode preference, safety, etc).
+#'   In practice, the higher this value, the more itineraries will be returned
+#'   in the final result.
 #' @param shortest_path A logical. Whether the function should only return the
 #'   fastest itinerary between each origin and destination pair (the default)
 #'   or multiple alternatives.