-
Notifications
You must be signed in to change notification settings - Fork 466
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
Add h3ToIj #102
Merged
Merged
Add h3ToIj #102
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
5abcf1e
Add h3ToIj
09a3bce
Fix whitespace in CMakeLists.txt
9e52b63
Add additional comments about failure cases
1204338
Adjust comments in testH3ToIj.c per review
60da119
Merge branch 'master' into h3-to-ij
b81299d
Rename `h3ToIj` to `experimentalH3ToLocalIj`
d1927f8
Merge branch 'master' into h3-to-ij
62863a4
Add h3ToLocalIj to CHANGELOG
1170719
Cleanup refactoring to localij.h
ffc1b32
Merge branch 'master' into h3-to-ij
974b3f2
Add experimentalLocalIjToH3
bac0ad1
Merge branch 'master' into h3-to-ij
9ff9d20
Fix capitalization of localij.h
a2b720d
Fix undefined handling of deleted base cell
d722df2
Add tests for out of range local IJ coordinates, assert unrotated dir…
3671b4e
Add test for traversing the local IJ space
b982cb6
Adjust comments and test assertion messages based on feedback.
8cd83bb
Remove check for the mode of indexes in h3ToLocalIjk
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 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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright 2018 Uber Technologies, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| /** @file | ||
| * @brief tests IJ grid functions and IJK distance functions. | ||
| * | ||
| * usage: `testCoordIj` | ||
| */ | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #include "algos.h" | ||
| #include "baseCells.h" | ||
| #include "constants.h" | ||
| #include "h3Index.h" | ||
| #include "h3api.h" | ||
| #include "localij.h" | ||
| #include "stackAlloc.h" | ||
| #include "test.h" | ||
| #include "utility.h" | ||
|
|
||
| SUITE(coordIj) { | ||
| TEST(ijkToIj_zero) { | ||
| CoordIJK ijk = {0}; | ||
| CoordIJ ij = {0}; | ||
|
|
||
| ijkToIj(&ijk, &ij); | ||
| t_assert(ij.i == 0, "ij.i zero"); | ||
| t_assert(ij.j == 0, "ij.j zero"); | ||
|
|
||
| ijToIjk(&ij, &ijk); | ||
| t_assert(ijk.i == 0, "ijk.i zero"); | ||
| t_assert(ijk.j == 0, "ijk.j zero"); | ||
| t_assert(ijk.k == 0, "ijk.k zero"); | ||
| } | ||
|
|
||
| TEST(ijkToIj_roundtrip) { | ||
| for (Direction dir = CENTER_DIGIT; dir < NUM_DIGITS; dir++) { | ||
| CoordIJK ijk = {0}; | ||
| _neighbor(&ijk, dir); | ||
|
|
||
| CoordIJ ij = {0}; | ||
| ijkToIj(&ijk, &ij); | ||
|
|
||
| CoordIJK recovered = {0}; | ||
| ijToIjk(&ij, &recovered); | ||
|
|
||
| t_assert(_ijkMatches(&ijk, &recovered), | ||
| "got same ijk coordinates back"); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
Is this supposed to be
h3ToLocalIjlike elsewhere or no?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.
No, as below the IJK functions need to be kept for internal implementation.