Code refactoring: Replace Sphere by ShellEnvelope, Shape3D heritage, and move everything under geometryObjects #40
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
… Add license header for spatialPartitioning/Octree*.scala.
… a val, so cannot be nulled afterwards
…e modified anymore once initialized (test modified accordingly)! Add two methods to easily define a Sphere from the Shell
…od with Shell and Box envelopes
…ese routines must be updated later on to include the possibility to load Shells as well
…d anynore: replaced by ShellEnvelope everywhere.
Codecov Report
@@ Coverage Diff @@
## master #40 +/- ##
==========================================
+ Coverage 98.87% 98.99% +0.11%
==========================================
Files 19 18 -1
Lines 713 697 -16
Branches 179 176 -3
==========================================
- Hits 705 690 -15
+ Misses 8 7 -1
Continue to review full report at Codecov.
|
|
Before merging, I still need to update notebooks. |
|
Notebooks are fine -- nothing changed. Merging and bumping the version. |
|
The code looks much cleaner now :) |
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.
Three major things in this PR:
ShellEnvelope,BoxEnvelopeingeometryObjectssub-folderShellEnvelopeandBoxEnvelopeherit fromShape3Dand no longerEnvelope. By doing so, all geometrical objects come fromShape3DSphereby sub-case ofShellEnvelope(innerRadius=0.0), and completely remove theSphereclass.There are also minor changes:
Shape3Dhas been simplified. All subclasses have been modified accordingly.ShellEnvelopeandBoxEnvelopeI changed the declaration of thecenter: it is now aval, so cannot be changed or nulled afterwards (tests also modified accordingly).ShellEnvelopeto easily define a Sphere from the Shellintersectmethod ofPoint3Dwith Shell and Box envelopesspatialPartitioning/Octree*.scala.From the user point of view, nothing really change (loading the data from SphereRDD is unchanged).
However I think it would be a good idea later on to include the possibility to load Shells as well. We could even have only one routine to load Point3D (3 args), Sphere (4 args), and Shells (5 args)... TBD.