Move Vec3d to its own files #67
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
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
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 |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * 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 generateFaceCenterPoint.c | ||
| * @brief Generates the faceCenterPoint table | ||
| * | ||
| * usage: `generateFaceCenterPoint` | ||
| */ | ||
|
|
||
| #include <stdlib.h> | ||
| #include "faceijk.h" | ||
| #include "vec3d.h" | ||
|
|
||
| /** | ||
| * Generates and prints the faceCenterPoint table. | ||
| */ | ||
| static void generate() { | ||
| printf("static const Vec3d faceCenterPoint[NUM_ICOSA_FACES] = {\n"); | ||
| for (int i = 0; i < NUM_ICOSA_FACES; i++) { | ||
| GeoCoord centerCoords = faceCenterGeo[i]; | ||
| Vec3d centerPoint; | ||
| _geoToVec3d(¢erCoords, ¢erPoint); | ||
| printf(" {%.16f, %.16f, %.16f}, // face %2d\n", centerPoint.x, | ||
| centerPoint.y, centerPoint.z, i); | ||
| } | ||
| printf("};\n"); | ||
| } | ||
|
|
||
| int main(int argc, char* argv[]) { | ||
| // check command line args | ||
| if (argc > 1) { | ||
| fprintf(stderr, "usage: %s\n", argv[0]); | ||
| exit(1); | ||
| } | ||
|
|
||
| generate(); | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| #include <float.h> | ||
| #include <math.h> | ||
| #include <stdlib.h> | ||
| #include "test.h" | ||
| #include "vec3d.h" | ||
|
|
||
| BEGIN_TESTS(Vec3d); | ||
|
|
||
| TEST(_pointSquareDist) { | ||
|
There was a problem hiding this comment. Thanks for adding tests! |
||
| Vec3d v1 = {0, 0, 0}; | ||
| Vec3d v2 = {1, 0, 0}; | ||
| Vec3d v3 = {0, 1, 1}; | ||
| Vec3d v4 = {1, 1, 1}; | ||
| Vec3d v5 = {1, 1, 2}; | ||
|
|
||
| t_assert(fabs(_pointSquareDist(&v1, &v1)) < DBL_EPSILON, | ||
| "distance to self is 0"); | ||
| t_assert(fabs(_pointSquareDist(&v1, &v2) - 1) < DBL_EPSILON, | ||
| "distance to <1,0,0> is 1"); | ||
| t_assert(fabs(_pointSquareDist(&v1, &v3) - 2) < DBL_EPSILON, | ||
| "distance to <0,1,1> is 2"); | ||
| t_assert(fabs(_pointSquareDist(&v1, &v4) - 3) < DBL_EPSILON, | ||
| "distance to <1,1,1> is 3"); | ||
| t_assert(fabs(_pointSquareDist(&v1, &v5) - 6) < DBL_EPSILON, | ||
| "distance to <1,1,2> is 6"); | ||
| } | ||
|
|
||
| TEST(_geoToVec3d) { | ||
| Vec3d origin = {0}; | ||
|
There was a problem hiding this comment. For my info - why not There was a problem hiding this comment. I understand this should be the same as initializing all members to 0, https://stackoverflow.com/questions/11152160/initializing-a-struct-to-0 |
||
|
|
||
| GeoCoord c1 = {0, 0}; | ||
| Vec3d p1; | ||
| _geoToVec3d(&c1, &p1); | ||
| t_assert(fabs(_pointSquareDist(&origin, &p1) - 1) < EPSILON_RAD, | ||
| "Geo point is on the unit sphere"); | ||
|
|
||
| GeoCoord c2 = {M_PI_2, 0}; | ||
| Vec3d p2; | ||
| _geoToVec3d(&c2, &p2); | ||
| t_assert(fabs(_pointSquareDist(&p1, &p2) - 2) < EPSILON_RAD, | ||
| "Geo point is on another axis"); | ||
|
|
||
| GeoCoord c3 = {M_PI, 0}; | ||
| Vec3d p3; | ||
| _geoToVec3d(&c3, &p3); | ||
| t_assert(fabs(_pointSquareDist(&p1, &p3) - 4) < EPSILON_RAD, | ||
| "Geo point is the other side of the sphere"); | ||
| } | ||
|
|
||
| END_TESTS(); | ||
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
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
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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * 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 vec3d.h | ||
| * @brief 3D floating point vector functions. | ||
| */ | ||
|
|
||
| #ifndef VEC3D_H | ||
| #define VEC3D_H | ||
|
|
||
| #include "geoCoord.h" | ||
|
|
||
| /** @struct Vec3D | ||
| * @brief 3D floating point structure | ||
| */ | ||
| typedef struct { | ||
| double x; ///< x component | ||
| double y; ///< y component | ||
| double z; ///< z component | ||
| } Vec3d; | ||
|
|
||
| void _geoToVec3d(const GeoCoord* geo, Vec3d* point); | ||
| double _pointSquareDist(const Vec3d* p1, const Vec3d* p2); | ||
|
|
||
| #endif |
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
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
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.
Any need for this block, when the script takes no args?
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.
It just checks that no (unused) args were provided.
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.
Same comment as other review (#69), you can always do
int main(void)in this case. No need to be "strict" about it.