Skip to content
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.

Sign up for GitHub

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

Test Fixes #3898

Merged
merged 5 commits into from
Jun 8, 2020
Merged

Test Fixes #3898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27d30f2
added findutils
Jun 4, 2020
5286564
temp output for findfeatures
Jun 4, 2020
4eeb8a9
embree tests rounding
Jun 5, 2020
e3f1dbb
Merge branch 'dev' of https://github.com/USGS-Astrogeology/ISIS3 into…
Jun 5, 2020
4120f2c
re-added prints
Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ for (lbl in labels) {
condaEnv("isis3") {
// Environment
loginShell """
conda install -c conda-forge python=3
conda install -c conda-forge python=3 findutils
Copy link
Collaborator Author

@Kelvinrr Kelvinrr Jun 5, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

temporary fix, PR into the docker repo incoming. Not sure how that process will go to get the new containers running (had flakiness from updating image:latest and not being pulled as k8s doesn't see it as a newer version of the container ) so I don't want to count on it too much at the moment.

conda env update -f ${envFile} --prune
mkdir build install
"""
Expand Down
20 changes: 10 additions & 10 deletions isis/src/base/objs/EmbreeShapeModel/EmbreeShapeModel.truth
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.2908 , -0.0019 , 0.0005 )
Model has normal? true
Surface Normal: ( 0.847198 , -0.194495 , 0.494395 )
Surface Normal: ( 0.8471 , -0.1944 , 0.4943 )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this rounding a Mac vs Linux issue?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of, Embree only does floating point precision calculations and we sometimes see very small differences based on OS.



Testing observer look direction non-intersection
Expand All @@ -73,7 +73,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.0087 , 0.0886 , 0.0878 )
Model has normal? true
Surface Normal: ( -0.04559 , 0.672259 , 0.738911 )
Surface Normal: ( -0.0455 , 0.6722 , 0.7389 )


Testing latitude, longitude occlusion
Expand All @@ -94,7 +94,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.0255 , -0.1383 , -0.0001 )
Model has normal? true
Surface Normal: ( 0.397582 , -0.895341 , -0.200733 )
Surface Normal: ( 0.3975 , -0.8953 , -0.2007 )


Testing surface point intersection
Expand All @@ -108,7 +108,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( -0.2165 , -0.0778 , 0 )
Model has normal? true
Surface Normal: ( -0.73405 , -0.654923 , 0.17957 )
Surface Normal: ( -0.734 , -0.6549 , 0.1795 )


Testing surface point occlusion
Expand All @@ -127,7 +127,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.0105 , 0.0639 , -0.065 )
Model has normal? true
Surface Normal: ( 0.250858 , 0.57346 , -0.779881 )
Surface Normal: ( 0.2508 , 0.5734 , -0.7798 )


Testing local radius
Expand All @@ -142,7 +142,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.0105 , 0.0639 , -0.065 )
Model has normal? true
Surface Normal: ( 0.250858 , 0.57346 , -0.779881 )
Surface Normal: ( 0.2508 , 0.5734 , -0.7798 )

Testing visibility check

Expand All @@ -152,7 +152,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.2908 , -0.0019 , 0.0005 )
Model has normal? true
Surface Normal: ( 0.847198 , -0.194495 , 0.494395 )
Surface Normal: ( 0.8471 , -0.1944 , 0.4943 )

Intersection is visible from same position and look direction? true
Intersection is visible with non-intersecting look? false
Expand All @@ -167,14 +167,14 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.2908 , -0.0019 , 0.0005 )
Model has normal? true
Surface Normal: ( 0.847198 , -0.194495 , 0.494395 )
Surface Normal: ( 0.8471 , -0.1944 , 0.4943 )

Model status after recalculating
Embree shape model status:
Model has intersection? true
Surface Point: ( 0.2908 , -0.0019 , 0.0005 )
Model has normal? true
Surface Normal: ( 0.999747 , -0.0209697 , 0.00810027 )
Surface Normal: ( 0.9997 , -0.0209 , 0.0081 )

Testing photometric angles

Expand All @@ -183,7 +183,7 @@ Embree shape model status:
Model has intersection? true
Surface Point: ( 0.2908 , -0.0019 , 0.0005 )
Model has normal? true
Surface Normal: ( 0.999747 , -0.0209697 , 0.00810027 )
Surface Normal: ( 0.9997 , -0.0209 , 0.0081 )

Emission angle: 1.28823
Incidence angle: 6.92945
Expand Down
6 changes: 3 additions & 3 deletions isis/src/base/objs/EmbreeShapeModel/unitTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ void outputModelStatus(EmbreeShapeModel &embreeModel) {
if ( embreeModel.hasNormal() ) {
embreeNormal = embreeModel.normal();
qDebug() << " Surface Normal: ("
<< embreeNormal[0] << ", "
<< embreeNormal[1] << ", "
<< embreeNormal[2] << ")";
<< roundToPrecision(embreeNormal[0], 0.0001) << ", "
<< roundToPrecision(embreeNormal[1], 0.0001) << ", "
<< roundToPrecision(embreeNormal[2], 0.0001) << ")";
}
qDebug() << "";
}
Expand Down