Issue 73 #81
Closed
Issue 73 #81
Conversation
This file contains 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
still need to add some more unit tests so this doesn't happen again
also ended up having to sort the distance-node pairs properly that come out of ch. for some reason ch gives the top N number of POIs, but not necessarily in the right order, so we have to sort by distance. In the case that we want the POI ids of the N closest POIs, we neeed to sort the node_ids by distance, so we use std::pair, which is painful but is par for the course for C++. anyway it gave the right result both before and after
federicofernandez
approved these changes
May 12, 2017
| void ContractionHierarchies::createPOIIndex(unsigned categoryNum, unsigned maxDistanceToConsider, unsigned maxNumberOfPOIsInBucket){ | ||
| CHASSERT(this->staticGraph != NULL, "Preprocessing not finished"); | ||
| // reinitialize this bucket | ||
| poiIndexArray[categoryNum] = CHPOIIndex(this->staticGraph, maxDistanceToConsider, maxNumberOfPOIsInBucket, numberOfThreads); |
There was a problem hiding this comment.
I think it's a good idea to check if the categoryNum is bigger than poiIndexArray size (given that's a std::vector), just in case.
pksohn
approved these changes
May 12, 2017
|
@federicofernandez I added the check you asked for. Also do I need to call the destructor of the old index to not have a memory leak? |
|
Regarding the |
federicofernandez
approved these changes
May 15, 2017
|
@federicofernandez that's what I thought but wanted an expert to double check. I think this is ready to merge, and I think we'll need to do a new release. Do we have any users that can look at the results visually (like on a map) and see if it works? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This, I am hoping fixes #73.
There were two things broken here. First, when calling set_pois, we call the underlying set_pois routine in CH, which doesn't actually re-initialize the category, it just adds pois. This is not what was expected so I had to add the code to re-initialize. This behavior has actually been around since day 1.
Second, the code from 2 years ago which returned poi ids in addition to poi distances introduced a bug which doesn't return the first poi id encountered, which is a fairly egregious error.
@pksohn unfortunately because of this last one, I think we will have to cut a new release of pandana once we get this PR merged.