forked from reinterpretcat/vrp
-
Notifications
You must be signed in to change notification settings - Fork 1
Deal with timestamp overflows #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rtpg
wants to merge
1
commit into
uptick:master
Choose a base branch
from
rtpg:timestamp-max
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ pub mod discovery; | |
| pub mod regression; | ||
|
|
||
| pub use vrp_core as core; | ||
| use vrp_core::models::common::Timestamp; | ||
|
|
||
| mod utils; | ||
|
|
||
|
|
@@ -36,8 +37,8 @@ pub mod validation; | |
|
|
||
| use crate::format::problem::Problem; | ||
| use crate::format::{CoordIndex, Location}; | ||
| use time::OffsetDateTime; | ||
| use time::format_description::well_known::Rfc3339; | ||
| use time::{Date, OffsetDateTime, Time, UtcOffset}; | ||
| use vrp_core::prelude::{Float, GenericError}; | ||
|
|
||
| /// Get lists of unique locations in the problem. Use it to request routing matrix from outside. | ||
|
|
@@ -46,9 +47,16 @@ pub fn get_unique_locations(problem: &Problem) -> Vec<Location> { | |
| CoordIndex::new(problem).unique() | ||
| } | ||
|
|
||
| fn format_time(time: Float) -> String { | ||
| // vrp_core's Timestamps are f64s that could go far beyond what unix timestamps support | ||
| const MIN_TIMESTAMP: i64 = OffsetDateTime::new_in_offset(Date::MIN, Time::MIDNIGHT, UtcOffset::UTC).unix_timestamp(); | ||
| const MAX_TIMESTAMP: i64 = OffsetDateTime::new_in_offset(Date::MAX, Time::MAX, UtcOffset::UTC).unix_timestamp(); | ||
|
|
||
| fn format_time(time: Timestamp) -> String { | ||
| let time: i64 = (time as i64).clamp(MIN_TIMESTAMP, MAX_TIMESTAMP); | ||
| // TODO avoid using implicitly unwrap | ||
| OffsetDateTime::from_unix_timestamp(time as i64).map(|time| time.format(&Rfc3339).unwrap()).unwrap() | ||
| // (a priori the above clamping should prevent any potential failure here...) | ||
| let ts = OffsetDateTime::from_unix_timestamp(time).expect("Could not convert value to timestamp"); | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not to get too in the weeds but the error message should be a |
||
| return ts.format(&Rfc3339).expect("Error formatting timestamp to time"); | ||
| } | ||
|
|
||
| fn parse_time(time: &str) -> Float { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
haven't seen anything near
MIN_TIMESTAMPbut the handling is the same and it reduces the window of failure