Merge pull request #319 from jGaboardi/issue_318

swapping out distance calculation function
pysal · Oct 15, 2019 · cf7908b · cf7908b
2 parents e9d31e0 + d994298
commit cf7908b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docs/.nojekyll b/docs/.nojekyll
@@ -1 +1 @@
-  
+
diff --git a/docs/_modules/spaghetti/network.html b/docs/_modules/spaghetti/network.html
@@ -1665,7 +1665,7 @@ <h1>Source code for spaghetti.network</h1><div class="highlight"><pre>
 <span class="sd">        &gt;&gt;&gt; s2d_dist = ntw.allneighbordistances(&#39;crimes&#39;,</span>
 <span class="sd">        ...                                     destpattern=&#39;schools&#39;)</span>
 <span class="sd">        &gt;&gt;&gt; s2d_dist[0,0], s2d_dist[1,0]</span>
-<span class="sd">        (4520.72353741989, 6340.422971967316)</span>
+<span class="sd">        (4520.72353741989, 6340.422971967315)</span>
 <span class="sd">        </span>
 <span class="sd">        </span>
 <span class="sd">        &gt;&gt;&gt; s2d_dist, tree = ntw.allneighbordistances(&#39;schools&#39;,</span>

diff --git a/docs/generated/spaghetti.Network.allneighbordistances.html b/docs/generated/spaghetti.Network.allneighbordistances.html
@@ -202,7 +202,7 @@ <h1>spaghetti.Network.allneighbordistances<a class="headerlink" href="#spaghetti
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">s2d_dist</span> <span class="o">=</span> <span class="n">ntw</span><span class="o">.</span><span class="n">allneighbordistances</span><span class="p">(</span><span class="s1">&#39;crimes&#39;</span><span class="p">,</span>
 <span class="gp">... </span>                                    <span class="n">destpattern</span><span class="o">=</span><span class="s1">&#39;schools&#39;</span><span class="p">)</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">s2d_dist</span><span class="p">[</span><span class="mi">0</span><span class="p">,</span><span class="mi">0</span><span class="p">],</span> <span class="n">s2d_dist</span><span class="p">[</span><span class="mi">1</span><span class="p">,</span><span class="mi">0</span><span class="p">]</span>
-<span class="go">(4520.72353741989, 6340.422971967316)</span>
+<span class="go">(4520.72353741989, 6340.422971967315)</span>
 </pre></div>
 </div>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">s2d_dist</span><span class="p">,</span> <span class="n">tree</span> <span class="o">=</span> <span class="n">ntw</span><span class="o">.</span><span class="n">allneighbordistances</span><span class="p">(</span><span class="s1">&#39;schools&#39;</span><span class="p">,</span>

diff --git a/spaghetti/network.py b/spaghetti/network.py
@@ -1549,7 +1549,7 @@ def allneighbordistances(
         >>> s2d_dist = ntw.allneighbordistances('crimes',
         ...                                     destpattern='schools')
         >>> s2d_dist[0,0], s2d_dist[1,0]
-        (4520.72353741989, 6340.422971967316)
+        (4520.72353741989, 6340.422971967315)
         
         
         >>> s2d_dist, tree = ntw.allneighbordistances('schools',

diff --git a/spaghetti/util.py b/spaghetti/util.py
@@ -44,7 +44,7 @@ def compute_length(v0, v1):
     
     """
 
-    euc_dist = np.sqrt((v0[0] - v1[0]) ** 2 + (v0[1] - v1[1]) ** 2)
+    euc_dist = cg.standalone.get_points_dist(v0, v1)
 
     return euc_dist