deploy: 1a5f548

LAPKB · Feb 20, 2024 · 4d93000 · 4d93000
1 parent 65e0a73
commit 4d93000
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/pmcore/algorithms/npag.rs.html b/src/pmcore/algorithms/npag.rs.html
@@ -345,7 +345,7 @@
         algorithms::Algorithm,
         datafile::Scenario,
         evaluation::sigma::{ErrorPoly, ErrorType},
-        ipm::burke,
+        ipm_faer::burke,
         output::NPResult,
         output::{CycleLog, NPCycle},
         prob, qr,

diff --git a/src/pmcore/algorithms/npod.rs.html b/src/pmcore/algorithms/npod.rs.html
@@ -326,15 +326,14 @@
 <a href="#325" id="325">325</a>
 <a href="#326" id="326">326</a>
 <a href="#327" id="327">327</a>
-<a href="#328" id="328">328</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     prelude::{
         algorithms::Algorithm,
         condensation::prune::prune,
         datafile::Scenario,
         evaluation::sigma::{ErrorPoly, ErrorType},
-        <span class="comment">// ipm,
-        </span>optimization::d_optimizer::SppOptimizer,
+        ipm_faer::burke,
+        optimization::d_optimizer::SppOptimizer,
         output::NPResult,
         output::{CycleLog, NPCycle},
         prob,
@@ -350,7 +349,6 @@
 <span class="kw">use </span>ndarray_stats::{DeviationExt, QuantileExt};
 <span class="kw">use </span>tokio::sync::mpsc::UnboundedSender;
 
-<span class="kw">use </span><span class="kw">super</span>::evaluation::ipm;
 
 <span class="kw">const </span>THETA_D: f64 = <span class="number">1e-4</span>;
 <span class="kw">const </span>THETA_F: f64 = <span class="number">1e-2</span>;
@@ -483,14 +481,14 @@
                 e_type: <span class="kw-2">&amp;</span><span class="self">self</span>.error_type,
             },
         );
-        <span class="kw">let </span>(lambda_up, objf_up) = <span class="kw">match </span>ipm::burke(<span class="kw-2">&amp;</span>psi_up) {
+        <span class="kw">let </span>(lambda_up, objf_up) = <span class="kw">match </span>burke(<span class="kw-2">&amp;</span>psi_up) {
             <span class="prelude-val">Ok</span>((lambda, objf)) =&gt; (lambda, objf),
             <span class="prelude-val">Err</span>(err) =&gt; {
                 <span class="comment">//todo: write out report
                 </span><span class="macro">panic!</span>(<span class="string">"Error in IPM: {:?}"</span>, err);
             }
         };
-        <span class="kw">let </span>(lambda_down, objf_down) = <span class="kw">match </span>ipm::burke(<span class="kw-2">&amp;</span>psi_down) {
+        <span class="kw">let </span>(lambda_down, objf_down) = <span class="kw">match </span>burke(<span class="kw-2">&amp;</span>psi_down) {
             <span class="prelude-val">Ok</span>((lambda, objf)) =&gt; (lambda, objf),
             <span class="prelude-val">Err</span>(err) =&gt; {
                 <span class="comment">//todo: write out report
@@ -534,7 +532,7 @@
                     e_type: <span class="kw-2">&amp;</span><span class="self">self</span>.error_type,
                 },
             );
-            (<span class="self">self</span>.lambda, <span class="kw">_</span>) = <span class="kw">match </span>ipm::burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi) {
+            (<span class="self">self</span>.lambda, <span class="kw">_</span>) = <span class="kw">match </span>burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi) {
                 <span class="prelude-val">Ok</span>((lambda, objf)) =&gt; (lambda, objf),
                 <span class="prelude-val">Err</span>(err) =&gt; {
                     <span class="comment">//todo: write out report
@@ -574,7 +572,7 @@
             <span class="self">self</span>.theta = <span class="self">self</span>.theta.select(Axis(<span class="number">0</span>), <span class="kw-2">&amp;</span>keep);
             <span class="self">self</span>.psi = <span class="self">self</span>.psi.select(Axis(<span class="number">1</span>), <span class="kw-2">&amp;</span>keep);
 
-            (<span class="self">self</span>.lambda, <span class="self">self</span>.objf) = <span class="kw">match </span>ipm::burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi) {
+            (<span class="self">self</span>.lambda, <span class="self">self</span>.objf) = <span class="kw">match </span>burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi) {
                 <span class="prelude-val">Ok</span>((lambda, objf)) =&gt; (lambda, objf),
                 <span class="prelude-val">Err</span>(err) =&gt; {
                     <span class="comment">//todo: write out report

diff --git a/src/pmcore/algorithms/postprob.rs.html b/src/pmcore/algorithms/postprob.rs.html
@@ -113,15 +113,13 @@
 <a href="#112" id="112">112</a>
 <a href="#113" id="113">113</a>
 <a href="#114" id="114">114</a>
-<a href="#115" id="115">115</a>
-<a href="#116" id="116">116</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     prelude::{
         algorithms::Algorithm,
         datafile::Scenario,
         evaluation::sigma::{ErrorPoly, ErrorType},
-        <span class="comment">// ipm,
-        </span>output::NPResult,
+        ipm_faer::burke,
+        output::NPResult,
         prob,
         settings::Settings,
         simulation::predict::Engine,
@@ -133,8 +131,6 @@
 <span class="kw">use </span>ndarray::{Array1, Array2};
 <span class="kw">use </span>tokio::sync::mpsc::UnboundedSender;
 
-<span class="kw">use </span><span class="kw">super</span>::evaluation::ipm;
-
 <span class="doccomment">/// Posterior probability algorithm
 /// Reweights the prior probabilities to the observed data and error model
 </span><span class="kw">pub struct </span>POSTPROB&lt;S&gt;
@@ -225,7 +221,7 @@
                 e_type: <span class="kw-2">&amp;</span><span class="self">self</span>.error_type,
             },
         );
-        <span class="kw">let </span>(w, objf) = ipm::burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi).expect(<span class="string">"Error in IPM"</span>);
+        <span class="kw">let </span>(w, objf) = burke(<span class="kw-2">&amp;</span><span class="self">self</span>.psi).expect(<span class="string">"Error in IPM"</span>);
         <span class="self">self</span>.w = w;
         <span class="self">self</span>.objf = objf;
         <span class="self">self</span>.to_npresult()