From 0293aab471df21ae6d5d116b6a5a79d55d37edef Mon Sep 17 00:00:00 2001
From: Quan Wang <quanw@google.com>
Date: Thu, 24 Aug 2023 10:48:21 -0400
Subject: [PATCH] [Issue #51] Fix a typo in the autotune.Proxy conditions

---
 .gitignore                                   | 1 +
 docs/spectralcluster.html                    | 4 ++--
 docs/spectralcluster/configs.html            | 4 ++--
 docs/spectralcluster/spectral_clusterer.html | 6 +++---
 setup.py                                     | 2 +-
 spectralcluster/spectral_clusterer.py        | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b373c5..996e6db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ spectralcluster.egg-info/*
 .DS_Store
 .pytype
 coverage.xml
+.venv
diff --git a/docs/spectralcluster.html b/docs/spectralcluster.html
index ea72611..f0908f8 100644
--- a/docs/spectralcluster.html
+++ b/docs/spectralcluster.html
@@ -3300,7 +3300,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer-281"><a href="#SpectralClusterer-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer-282"><a href="#SpectralClusterer-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-283"><a href="#SpectralClusterer-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-285"><a href="#SpectralClusterer-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer-286"><a href="#SpectralClusterer-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer-287"><a href="#SpectralClusterer-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
@@ -3708,7 +3708,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer.predict-281"><a href="#SpectralClusterer.predict-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer.predict-282"><a href="#SpectralClusterer.predict-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-283"><a href="#SpectralClusterer.predict-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-285"><a href="#SpectralClusterer.predict-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer.predict-286"><a href="#SpectralClusterer.predict-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-287"><a href="#SpectralClusterer.predict-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
diff --git a/docs/spectralcluster/configs.html b/docs/spectralcluster/configs.html
index f6007de..3ca5a1f 100644
--- a/docs/spectralcluster/configs.html
+++ b/docs/spectralcluster/configs.html
@@ -1758,7 +1758,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer-281"><a href="#SpectralClusterer-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer-282"><a href="#SpectralClusterer-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-283"><a href="#SpectralClusterer-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-285"><a href="#SpectralClusterer-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer-286"><a href="#SpectralClusterer-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer-287"><a href="#SpectralClusterer-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
@@ -2166,7 +2166,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer.predict-281"><a href="#SpectralClusterer.predict-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer.predict-282"><a href="#SpectralClusterer.predict-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-283"><a href="#SpectralClusterer.predict-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-285"><a href="#SpectralClusterer.predict-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer.predict-286"><a href="#SpectralClusterer.predict-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-287"><a href="#SpectralClusterer.predict-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
diff --git a/docs/spectralcluster/spectral_clusterer.html b/docs/spectralcluster/spectral_clusterer.html
index 33d6e36..f8e286f 100644
--- a/docs/spectralcluster/spectral_clusterer.html
+++ b/docs/spectralcluster/spectral_clusterer.html
@@ -587,7 +587,7 @@ <h1 class="modulename">
 </span><span id="L-280"><a href="#L-280"><span class="linenos">280</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="L-281"><a href="#L-281"><span class="linenos">281</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="L-282"><a href="#L-282"><span class="linenos">282</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="L-283"><a href="#L-283"><span class="linenos">283</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="L-283"><a href="#L-283"><span class="linenos">283</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="L-284"><a href="#L-284"><span class="linenos">284</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="L-285"><a href="#L-285"><span class="linenos">285</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="L-286"><a href="#L-286"><span class="linenos">286</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
@@ -2172,7 +2172,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer-281"><a href="#SpectralClusterer-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer-282"><a href="#SpectralClusterer-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-283"><a href="#SpectralClusterer-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer-284"><a href="#SpectralClusterer-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer-285"><a href="#SpectralClusterer-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer-286"><a href="#SpectralClusterer-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer-287"><a href="#SpectralClusterer-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
@@ -2580,7 +2580,7 @@ <h5>Inherited Members</h5>
 </span><span id="SpectralClusterer.predict-281"><a href="#SpectralClusterer.predict-281"><span class="linenos">281</span></a>             <span class="n">affinity</span><span class="p">,</span> <span class="n">constraint_matrix</span><span class="p">)</span>
 </span><span id="SpectralClusterer.predict-282"><a href="#SpectralClusterer.predict-282"><span class="linenos">282</span></a>        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-283"><a href="#SpectralClusterer.predict-283"><span class="linenos">283</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sqrt</span><span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
-</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileSqrtOverNME</span><span class="p">:</span>
+</span><span id="SpectralClusterer.predict-284"><a href="#SpectralClusterer.predict-284"><span class="linenos">284</span></a>        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">autotune</span><span class="o">.</span><span class="n">proxy</span> <span class="o">==</span> <span class="n">AutoTuneProxy</span><span class="o">.</span><span class="n">PercentileOverNME</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-285"><a href="#SpectralClusterer.predict-285"><span class="linenos">285</span></a>          <span class="n">ratio</span> <span class="o">=</span> <span class="p">(</span><span class="mi">1</span> <span class="o">-</span> <span class="n">p_percentile</span><span class="p">)</span> <span class="o">/</span> <span class="n">max_delta_norm</span>
 </span><span id="SpectralClusterer.predict-286"><a href="#SpectralClusterer.predict-286"><span class="linenos">286</span></a>        <span class="k">else</span><span class="p">:</span>
 </span><span id="SpectralClusterer.predict-287"><a href="#SpectralClusterer.predict-287"><span class="linenos">287</span></a>          <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unsupported value of AutoTuneProxy&quot;</span><span class="p">)</span>
diff --git a/setup.py b/setup.py
index 6be5779..59fef3c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 import setuptools
 
-VERSION = "0.2.20"
+VERSION = "0.2.21"
 
 with open("README.md", "r") as file_object:
     LONG_DESCRIPTION = file_object.read()
diff --git a/spectralcluster/spectral_clusterer.py b/spectralcluster/spectral_clusterer.py
index 52cadd0..ea88115 100644
--- a/spectralcluster/spectral_clusterer.py
+++ b/spectralcluster/spectral_clusterer.py
@@ -280,7 +280,7 @@ def p_percentile_to_ratio(p_percentile: float) -> (
              affinity, constraint_matrix)
         if self.autotune.proxy == AutoTuneProxy.PercentileSqrtOverNME:
           ratio = np.sqrt(1 - p_percentile) / max_delta_norm
-        elif self.autotune.proxy == AutoTuneProxy.PercentileSqrtOverNME:
+        elif self.autotune.proxy == AutoTuneProxy.PercentileOverNME:
           ratio = (1 - p_percentile) / max_delta_norm
         else:
           raise ValueError("Unsupported value of AutoTuneProxy")