Skip to content

Commit

Permalink
Merge pull request #410 from DataverseLabs/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
SimonMolinsky authored Sep 17, 2023
2 parents 2985322 + e8753e9 commit 7702435
Show file tree
Hide file tree
Showing 25 changed files with 457 additions and 597 deletions.
7 changes: 7 additions & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ Pyinterpolate is the Python library for **geostatistics** and **spatial statisti
Changes by date
===============

2023-09-16
----------

**version 0.5.0.post1**

* (debug) `hdbscan` is removed from requirements, cluster detection algorithms are blocked, and those will be reimplemented in the closest future. The `HDBSCAN` package breaks installation of the package.

2023-08-29
----------

Expand Down
Binary file modified docs/build/doctrees/api/distance/distance.doctree
Binary file not shown.
Binary file modified docs/build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/doctrees/index.doctree
Binary file not shown.
Binary file not shown.
3 changes: 1 addition & 2 deletions docs/build/html/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,7 @@
<article class="bd-article" role="main">

<h1>All modules for which code is available</h1>
<ul><li><a href="pyinterpolate/distance/clusters.html">pyinterpolate.distance.clusters</a></li>
<li><a href="pyinterpolate/distance/distance.html">pyinterpolate.distance.distance</a></li>
<ul><li><a href="pyinterpolate/distance/distance.html">pyinterpolate.distance.distance</a></li>
<li><a href="pyinterpolate/distance/gridding.html">pyinterpolate.distance.gridding</a></li>
<li><a href="pyinterpolate/idw/idw.html">pyinterpolate.idw.idw</a></li>
<li><a href="pyinterpolate/io/read_data.html">pyinterpolate.io.read_data</a></li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@


<!DOCTYPE html>


Expand All @@ -8,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pyinterpolate.variogram.indicator.indicator_variogram &#8212; Pyinterpolate 0.5 documentation</title>
<title>pyinterpolate.variogram.indicator.indicator_variogram &#8212; Pyinterpolate 0.5.0 documentation</title>



Expand All @@ -28,21 +27,18 @@
<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../_static/vendor/fontawesome/6.1.2/webfonts/fa-brands-400.woff2" />
<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../../_static/vendor/fontawesome/6.1.2/webfonts/fa-regular-400.woff2" />

<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../../../_static/copybutton.css" />
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=a746c00c" />
<link rel="stylesheet" type="text/css" href="../../../../_static/copybutton.css?v=76b2166b" />

<!-- Pre-loaded scripts that we'll load fully later -->
<link rel="preload" as="script" href="../../../../_static/scripts/bootstrap.js?digest=e353d410970836974a52" />
<link rel="preload" as="script" href="../../../../_static/scripts/pydata-sphinx-theme.js?digest=e353d410970836974a52" />

<script data-url_root="../../../../" id="documentation_options" src="../../../../_static/documentation_options.js"></script>
<script src="../../../../_static/jquery.js"></script>
<script src="../../../../_static/underscore.js"></script>
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js"></script>
<script src="../../../../_static/doctools.js"></script>
<script src="../../../../_static/sphinx_highlight.js"></script>
<script src="../../../../_static/clipboard.min.js"></script>
<script src="../../../../_static/copybutton.js"></script>
<script src="../../../../_static/documentation_options.js?v=70f82a29"></script>
<script src="../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="../../../../_static/clipboard.min.js?v=a7894cd8"></script>
<script src="../../../../_static/copybutton.js?v=f281be69"></script>
<script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
<script>DOCUMENTATION_OPTIONS.pagename = '_modules/pyinterpolate/variogram/indicator/indicator_variogram';</script>
<link rel="index" title="Index" href="../../../../genindex.html" />
Expand Down Expand Up @@ -108,7 +104,7 @@



<p class="title logo__title">Pyinterpolate 0.5 documentation</p>
<p class="title logo__title">Pyinterpolate 0.5.0 documentation</p>

</a></div>

Expand Down Expand Up @@ -432,7 +428,9 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="kn">from</span> <span class="nn">pyinterpolate.variogram.theoretical.semivariogram</span> <span class="kn">import</span> <span class="n">TheoreticalVariogram</span>


<div class="viewcode-block" id="IndicatorVariogramData"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariogramData">[docs]</a><span class="k">class</span> <span class="nc">IndicatorVariogramData</span><span class="p">:</span>
<div class="viewcode-block" id="IndicatorVariogramData">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariogramData">[docs]</a>
<span class="k">class</span> <span class="nc">IndicatorVariogramData</span><span class="p">:</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Class describes indicator variogram data.</span>

Expand Down Expand Up @@ -477,7 +475,10 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="bp">self</span><span class="o">.</span><span class="n">ids</span> <span class="o">=</span> <span class="n">code_indicators</span><span class="p">(</span><span class="n">input_array</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">thresholds</span><span class="p">)</span></div>


<div class="viewcode-block" id="ExperimentalIndicatorVariogram"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram">[docs]</a><span class="k">class</span> <span class="nc">ExperimentalIndicatorVariogram</span><span class="p">:</span>

<div class="viewcode-block" id="ExperimentalIndicatorVariogram">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram">[docs]</a>
<span class="k">class</span> <span class="nc">ExperimentalIndicatorVariogram</span><span class="p">:</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Class describes Experimental Indicator Variogram models.</span>

Expand Down Expand Up @@ -591,7 +592,9 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="k">if</span> <span class="n">fit</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">fit</span><span class="p">()</span>

<div class="viewcode-block" id="ExperimentalIndicatorVariogram.fit"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram.fit">[docs]</a> <span class="k">def</span> <span class="nf">fit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<div class="viewcode-block" id="ExperimentalIndicatorVariogram.fit">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram.fit">[docs]</a>
<span class="k">def</span> <span class="nf">fit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Function fits indicators to models and updates class models.</span>
<span class="sd"> &quot;&quot;&quot;</span>
Expand All @@ -610,7 +613,10 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">experimental_models</span><span class="p">[</span><span class="nb">str</span><span class="p">(</span><span class="n">indicator</span><span class="p">)]</span> <span class="o">=</span> <span class="n">exp</span></div>

<div class="viewcode-block" id="ExperimentalIndicatorVariogram.show"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram.show">[docs]</a> <span class="k">def</span> <span class="nf">show</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>

<div class="viewcode-block" id="ExperimentalIndicatorVariogram.show">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.ExperimentalIndicatorVariogram.show">[docs]</a>
<span class="k">def</span> <span class="nf">show</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Function shows generated experimental variograms for each indicator.</span>
<span class="sd"> &quot;&quot;&quot;</span>
Expand All @@ -624,10 +630,14 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="n">plt</span><span class="o">.</span><span class="n">legend</span><span class="p">(</span><span class="n">legend</span><span class="p">)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">xlabel</span><span class="p">(</span><span class="s1">&#39;Distance&#39;</span><span class="p">)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">ylabel</span><span class="p">(</span><span class="s1">&#39;Semivariance&#39;</span><span class="p">)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">show</span><span class="p">()</span></div></div>
<span class="n">plt</span><span class="o">.</span><span class="n">show</span><span class="p">()</span></div>
</div>


<div class="viewcode-block" id="IndicatorVariograms"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms">[docs]</a><span class="k">class</span> <span class="nc">IndicatorVariograms</span><span class="p">:</span>

<div class="viewcode-block" id="IndicatorVariograms">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms">[docs]</a>
<span class="k">class</span> <span class="nc">IndicatorVariograms</span><span class="p">:</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Class models indicator variograms for all indices.</span>

Expand Down Expand Up @@ -658,7 +668,9 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="bp">self</span><span class="o">.</span><span class="n">experimental_indicator_variogram</span> <span class="o">=</span> <span class="n">experimental_indicator_variogram</span>
<span class="bp">self</span><span class="o">.</span><span class="n">theoretical_indicator_variograms</span> <span class="o">=</span> <span class="p">{}</span>

<div class="viewcode-block" id="IndicatorVariograms.fit"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms.fit">[docs]</a> <span class="k">def</span> <span class="nf">fit</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span>
<div class="viewcode-block" id="IndicatorVariograms.fit">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms.fit">[docs]</a>
<span class="k">def</span> <span class="nf">fit</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span>
<span class="n">model_name</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="s1">&#39;linear&#39;</span><span class="p">,</span>
<span class="n">nugget</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span>
<span class="n">rang</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
Expand Down Expand Up @@ -799,7 +811,10 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="n">return_params</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">theoretical_indicator_variograms</span><span class="p">[</span><span class="n">idx</span><span class="p">]</span> <span class="o">=</span> <span class="n">theo</span></div>

<div class="viewcode-block" id="IndicatorVariograms.show"><a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms.show">[docs]</a> <span class="k">def</span> <span class="nf">show</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">subplots</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">False</span><span class="p">):</span>

<div class="viewcode-block" id="IndicatorVariograms.show">
<a class="viewcode-back" href="../../../../api/variogram/indicator/indicator.html#pyinterpolate.IndicatorVariograms.show">[docs]</a>
<span class="k">def</span> <span class="nf">show</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">subplots</span><span class="p">:</span> <span class="nb">bool</span> <span class="o">=</span> <span class="kc">False</span><span class="p">):</span>
<span class="w"> </span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Method plots experimental and theoretical variograms.</span>

Expand Down Expand Up @@ -868,7 +883,9 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d
<span class="n">_marker_idx</span> <span class="o">=</span> <span class="n">_marker_idx</span> <span class="o">+</span> <span class="mi">1</span>
<span class="n">plt</span><span class="o">.</span><span class="n">legend</span><span class="p">(</span><span class="n">legend</span><span class="p">)</span>

<span class="n">plt</span><span class="o">.</span><span class="n">show</span><span class="p">()</span></div></div>
<span class="n">plt</span><span class="o">.</span><span class="n">show</span><span class="p">()</span></div>
</div>

</pre></div>

</article>
Expand Down Expand Up @@ -921,7 +938,7 @@ <h1>Source code for pyinterpolate.variogram.indicator.indicator_variogram</h1><d

<div class="footer-item">
<p class="sphinx-version">
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 5.3.0.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 7.2.4.
<br/>
</p>
</div>
Expand Down
Loading

0 comments on commit 7702435

Please sign in to comment.