Deploying to gh-pages from @ 92b150a 🚀

graphnet-team · Dec 11, 2024 · 0502048 · 0502048
1 parent 6bfc529
commit 0502048
Show file tree

Hide file tree

Showing 7 changed files with 619 additions and 14 deletions.
diff --git a/_modules/graphnet/models/graphs/nodes/nodes.html b/_modules/graphnet/models/graphs/nodes/nodes.html
@@ -360,7 +360,7 @@ <h1 id="modules-graphnet-models-graphs-nodes-nodes--page-root">Source code for g
 <span class="kn">from</span> <span class="nn">graphnet.utilities.decorators</span> <span class="kn">import</span> <span class="n">final</span>
 <span class="kn">from</span> <span class="nn">graphnet.models</span> <span class="kn">import</span> <span class="n">Model</span>
 <span class="kn">from</span> <span class="nn">graphnet.models.graphs.utils</span> <span class="kn">import</span> <span class="p">(</span>
-    <span class="n">cluster_summarize_with_percentiles</span><span class="p">,</span>
+    <span class="n">cluster_and_pad</span><span class="p">,</span>
     <span class="n">identify_indices</span><span class="p">,</span>
     <span class="n">lex_sort</span><span class="p">,</span>
     <span class="n">ice_transparency</span><span class="p">,</span>
@@ -537,17 +537,14 @@ <h1 id="modules-graphnet-models-graphs-nodes-nodes--page-root">Source code for g
             <span class="n">cluster_idx</span><span class="p">,</span>
             <span class="n">summ_idx</span><span class="p">,</span>
             <span class="n">new_feature_names</span><span class="p">,</span>
-        <span class="p">)</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_get_indices_and_feature_names</span><span class="p">(</span>
-            <span class="n">input_feature_names</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">_add_counts</span>
-        <span class="p">)</span>
+        <span class="p">)</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_get_indices_and_feature_names</span><span class="p">(</span><span class="n">input_feature_names</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_cluster_indices</span> <span class="o">=</span> <span class="n">cluster_idx</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_summarization_indices</span> <span class="o">=</span> <span class="n">summ_idx</span>
         <span class="k">return</span> <span class="n">new_feature_names</span>
 
     <span class="k">def</span> <span class="nf">_get_indices_and_feature_names</span><span class="p">(</span>
         <span class="bp">self</span><span class="p">,</span>
         <span class="n">feature_names</span><span class="p">:</span> <span class="n">List</span><span class="p">[</span><span class="nb">str</span><span class="p">],</span>
-        <span class="n">add_counts</span><span class="p">:</span> <span class="nb">bool</span><span class="p">,</span>
     <span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Tuple</span><span class="p">[</span><span class="n">List</span><span class="p">[</span><span class="nb">int</span><span class="p">],</span> <span class="n">List</span><span class="p">[</span><span class="nb">int</span><span class="p">],</span> <span class="n">List</span><span class="p">[</span><span class="nb">str</span><span class="p">]]:</span>
         <span class="n">cluster_idx</span><span class="p">,</span> <span class="n">summ_idx</span><span class="p">,</span> <span class="n">summ_names</span> <span class="o">=</span> <span class="n">identify_indices</span><span class="p">(</span>
             <span class="n">feature_names</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">_cluster_on</span>
@@ -556,7 +553,7 @@ <h1 id="modules-graphnet-models-graphs-nodes-nodes--page-root">Source code for g
         <span class="k">for</span> <span class="n">feature</span> <span class="ow">in</span> <span class="n">summ_names</span><span class="p">:</span>
             <span class="k">for</span> <span class="n">pct</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_percentiles</span><span class="p">:</span>
                 <span class="n">new_feature_names</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="sa">f</span><span class="s2">"</span><span class="si">{</span><span class="n">feature</span><span class="si">}</span><span class="s2">_pct</span><span class="si">{</span><span class="n">pct</span><span class="si">}</span><span class="s2">"</span><span class="p">)</span>
-        <span class="k">if</span> <span class="n">add_counts</span><span class="p">:</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_add_counts</span><span class="p">:</span>
             <span class="c1"># add "counts" as the last feature</span>
             <span class="n">new_feature_names</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s2">"counts"</span><span class="p">)</span>
         <span class="k">return</span> <span class="n">cluster_idx</span><span class="p">,</span> <span class="n">summ_idx</span><span class="p">,</span> <span class="n">new_feature_names</span>
@@ -566,13 +563,16 @@ <h1 id="modules-graphnet-models-graphs-nodes-nodes--page-root">Source code for g
         <span class="n">x</span> <span class="o">=</span> <span class="n">x</span><span class="o">.</span><span class="n">numpy</span><span class="p">()</span>
         <span class="c1"># Construct clusters with percentile-summarized features</span>
         <span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s2">"_summarization_indices"</span><span class="p">):</span>
-            <span class="n">array</span> <span class="o">=</span> <span class="n">cluster_summarize_with_percentiles</span><span class="p">(</span>
-                <span class="n">x</span><span class="o">=</span><span class="n">x</span><span class="p">,</span>
+            <span class="n">cluster_class</span> <span class="o">=</span> <span class="n">cluster_and_pad</span><span class="p">(</span>
+                <span class="n">x</span><span class="o">=</span><span class="n">x</span><span class="p">,</span> <span class="n">cluster_columns</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_cluster_indices</span>
+            <span class="p">)</span>
+            <span class="n">cluster_class</span><span class="o">.</span><span class="n">add_percentile_summary</span><span class="p">(</span>
                 <span class="n">summarization_indices</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_summarization_indices</span><span class="p">,</span>
-                <span class="n">cluster_indices</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_cluster_indices</span><span class="p">,</span>
                 <span class="n">percentiles</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_percentiles</span><span class="p">,</span>
-                <span class="n">add_counts</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_add_counts</span><span class="p">,</span>
             <span class="p">)</span>
+            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_add_counts</span><span class="p">:</span>
+                <span class="n">cluster_class</span><span class="o">.</span><span class="n">add_counts</span><span class="p">()</span>
+            <span class="n">array</span> <span class="o">=</span> <span class="n">cluster_class</span><span class="o">.</span><span class="n">clustered_x</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">error</span><span class="p">(</span>
                 <span class="sa">f</span><span class="s2">"""</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="vm">__class__</span><span class="o">.</span><span class="vm">__name__</span><span class="si">}</span><span class="s2"> was not instatiated with</span>