Skip to content

Commit

Permalink
construct extract/contract configs to disable conditional restriction…
Browse files Browse the repository at this point in the history
… parsing by default
  • Loading branch information
karenzshea committed Oct 18, 2017
1 parent 37774a3 commit 5dfb1cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions include/extractor/extractor_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ struct ExtractorConfig final : storage::IOConfig
".osrm.cnbg",
".osrm.cnbg_to_ebg"}),
requested_num_threads(0),
parse_conditionals(false),

This comment has been minimized.

Copy link
@mloskot

mloskot Oct 18, 2017

Member

This is just a tidy up.

This comment has been minimized.

Copy link
@karenzshea

karenzshea Oct 18, 2017

Author Contributor

Yes, for your purposes.

Whether or not conditional restriction parsing has happened at the extract step, conditional restriction application in the contract step only uses them if enabled. However, having this as the default saves time/memory/disk resources.

This comment has been minimized.

Copy link
@mloskot

mloskot Oct 18, 2017

Member

Perhaps I assumed .osrm.restrictions file is not created if the cond. restr. are disabled.
The file is created, just has size Zero.

use_locations_cache(true)
{
}
Expand Down
8 changes: 4 additions & 4 deletions include/updater/updater_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ struct UpdaterConfig final : storage::IOConfig
".osrm.edges",
".osrm.geometry",
".osrm.fileIndex",
".osrm.properties",
".osrm.restrictions",
".osrm.properties"
},
{},
{".osrm.datasource_names"})
{".osrm.restrictions"},
{".osrm.datasource_names"}),

This comment has been minimized.

Copy link
@mloskot

mloskot Oct 18, 2017

Member

This shuffle of filename extensions seems to be just a tidy up as well.

valid_now(0)

This comment has been minimized.

Copy link
@mloskot

mloskot Oct 18, 2017

Member

This is the actual fix. In fact, I have also discovered it in my comment to the other PR (#3841 (comment))

Without setting valid_now=0, the two other changes have no effect regarding this issue.

{
}

Expand Down

0 comments on commit 5dfb1cb

Please sign in to comment.