Skip to content

Commit

Permalink
bug fixes for the sfn code. It seems to be working correctly now
Browse files Browse the repository at this point in the history
  • Loading branch information
@aliounis
aliounis committed Sep 28, 2021
1 parent d883ca6 commit 6612804
Show file tree
Hide file tree
Showing 22 changed files with 238 additions and 97 deletions.
Binary file modified documentation/html/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified .../sfn_class/giant.relative_opnav.estimators.sfn.sfn_class.SurfaceFeatureNavigation.doctree
View file
Binary file not shown.
Binary file modified ...ass/giant.relative_opnav.estimators.sfn.sfn_class.SurfaceFeatureNavigation.render.doctree
View file
Binary file not shown.
Binary file modified documentation/html/.doctrees/scripts/giant.scripts.spc_to_feature_catalogue.doctree
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions documentation/html/_modules/giant/ray_tracer/scene.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ <h1>Source code for giant.ray_tracer.scene</h1><div class="highlight"><pre>
<span class="n">ref_sphere</span> <span class="o">=</span> <span class="n">Ellipsoid</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_position</span><span class="o">.</span><span class="n">ravel</span><span class="p">(),</span>
<span class="n">principal_axes</span><span class="o">=</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([</span><span class="bp">self</span><span class="o">.</span><span class="n">_shape</span><span class="o">.</span><span class="n">principal_axes</span><span class="o">.</span><span class="n">mean</span><span class="p">()]</span> <span class="o">*</span> <span class="mi">3</span><span class="p">))</span>

<span class="k">elif</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_shape</span><span class="p">,</span> <span class="s1">&#39;reference_ellipsoid&#39;</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">elif</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_shape</span><span class="p">,</span> <span class="s1">&#39;reference_ellipsoid&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">ref_sphere</span> <span class="o">=</span> <span class="n">Ellipsoid</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_position</span><span class="o">.</span><span class="n">ravel</span><span class="p">(),</span>
<span class="n">principal_axes</span><span class="o">=</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([</span><span class="bp">self</span><span class="o">.</span><span class="n">_shape</span><span class="o">.</span><span class="n">reference_ellipsoid</span><span class="o">.</span><span class="n">principal_axes</span><span class="o">.</span><span class="n">mean</span><span class="p">()]</span> <span class="o">*</span> <span class="mi">3</span><span class="p">))</span>

Expand Down Expand Up @@ -745,14 +745,14 @@ <h1>Source code for giant.ray_tracer.scene</h1><div class="highlight"><pre>

<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="p">,</span> <span class="s2">&quot;order&quot;</span><span class="p">):</span>

<span class="bp">self</span><span class="o">.</span><span class="n">order</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">order</span><span class="p">,</span> <span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="o">.</span><span class="n">order</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">order</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">order</span><span class="p">,</span> <span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="o">.</span><span class="n">order</span><span class="p">)</span>

<span class="k">elif</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="p">,</span> <span class="s2">&quot;num_faces&quot;</span><span class="p">):</span>

<span class="bp">self</span><span class="o">.</span><span class="n">order</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">order</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">log10</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="o">.</span><span class="n">num_faces</span><span class="p">)))</span>

<span class="k">elif</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="p">,</span> <span class="s2">&quot;id&quot;</span><span class="p">):</span>
<span class="bp">self</span><span class="o">.</span><span class="n">order</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">order</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">log10</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="o">.</span><span class="n">id</span><span class="p">))</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">order</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">order</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">log10</span><span class="p">(</span><span class="n">obj</span><span class="o">.</span><span class="n">shape</span><span class="o">.</span><span class="n">id</span><span class="p">)))</span>

<span class="nd">@property</span>
<span class="k">def</span> <span class="nf">obscuring_objs</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Optional</span><span class="p">[</span><span class="n">List</span><span class="p">[</span><span class="n">SceneObject</span><span class="p">]]:</span>
Expand Down
Loading

0 comments on commit 6612804

Please sign in to comment.