Skip to content

Commit e50ec85

Browse files
committed
Fix AppVeyor?
1 parent 17d9abf commit e50ec85

File tree

9 files changed

+21
-22
lines changed

9 files changed

+21
-22
lines changed

README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Entropy
6363
print(svd_entropy(x, order=3, delay=1, normalize=True)) # Singular value decomposition entropy
6464
print(app_entropy(x, order=2, metric='chebyshev')) # Approximate entropy
6565
print(sample_entropy(x, order=2, metric='chebyshev')) # Sample entropy
66-
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
66+
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
6767
6868
.. parsed-literal::
6969
@@ -112,7 +112,6 @@ Here are some benchmarks computed on an average PC (i7-7700HQ CPU @ 2.80 Ghz - 8
112112
%timeit petrosian_fd(x)
113113
%timeit katz_fd(x)
114114
%timeit higuchi_fd(x) # Numba
115-
# Other
116115
%timeit detrended_fluctuation(x) # Numba
117116
118117
.. parsed-literal::
@@ -139,7 +138,7 @@ Note that this program is provided with NO WARRANTY OF ANY KIND. If you can, alw
139138
Acknowledgement
140139
===============
141140

142-
Several functions of EntroPy were borrowed from:
141+
Several functions of EntroPy were adapted from:
143142

144143
- MNE-features: https://github.com/mne-tools/mne-features
145144
- pyEntropy: https://github.com/nikdon/pyEntropy

appveyor.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ install:
1616
- "conda update -q conda"
1717
- "conda info -a"
1818
- "conda create -q -n testenv python=%PYTHON_VERSION% numpy scipy matplotlib pip cython"
19-
# Activate testing environnement :
20-
- "activate testenv"
21-
- "python -m pip install --upgrade pip"
22-
# Install dependencies :
23-
- "pip install pytest scikit-learn numba"
24-
- "dir"
25-
# ------------------- ENTROPY -------------------
26-
- "python setup.py develop"
19+
- activate test_env
20+
- pip install -r requirements.txt
21+
- pip install -r requirements-test.txt
22+
- pip install .
2723

2824
test_script:
29-
- "pytest --doctest-modules"
25+
- "pytest"

docs/build/html/_modules/entropy/entropy.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ <h1>Source code for entropy.entropy</h1><div class="highlight"><pre>
594594
<span class="sd">&quot;&quot;&quot;</span>
595595
<span class="sd"> Lempel-Ziv (LZ) complexity of binary sequence.</span>
596596

597+
<span class="sd"> .. versionadded:: 0.1.1</span>
598+
597599
<span class="sd"> Parameters</span>
598600
<span class="sd"> ----------</span>
599601
<span class="sd"> binary_sequence : str or array</span>

docs/build/html/_sources/index.rst.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Entropy
5858
print(svd_entropy(x, order=3, delay=1, normalize=True)) # Singular value decomposition entropy
5959
print(app_entropy(x, order=2, metric='chebyshev')) # Approximate entropy
6060
print(sample_entropy(x, order=2, metric='chebyshev')) # Sample entropy
61-
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
61+
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
6262
6363
.. parsed-literal::
6464
@@ -107,7 +107,6 @@ Here are some benchmarks computed on an average PC (i7-7700HQ CPU @ 2.80 Ghz - 8
107107
%timeit petrosian_fd(x)
108108
%timeit katz_fd(x)
109109
%timeit higuchi_fd(x) # Numba (fast)
110-
# Other
111110
%timeit detrended_fluctuation(x) # Numba (fast)
112111
113112
.. parsed-literal::
@@ -134,7 +133,7 @@ Note that this program is provided with NO WARRANTY OF ANY KIND. If you can, alw
134133
Acknowledgement
135134
===============
136135

137-
Several functions of EntroPy were borrowed from:
136+
Several functions of EntroPy were adapted from:
138137

139138
- MNE-features: https://github.com/mne-tools/mne-features
140139
- pyEntropy: https://github.com/nikdon/pyEntropy

docs/build/html/generated/entropy.lziv_complexity.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ <h1>entropy.lziv_complexity</h1>
9191
<dt id="entropy.lziv_complexity">
9292
<code class="sig-prename descclassname">entropy.</code><code class="sig-name descname">lziv_complexity</code><span class="sig-paren">(</span><em class="sig-param">binary_sequence</em>, <em class="sig-param">normalize=False</em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/entropy/entropy.html#lziv_complexity"><span class="viewcode-link">[source]</span></a></dt>
9393
<dd><p>Lempel-Ziv (LZ) complexity of binary sequence.</p>
94+
<div class="versionadded">
95+
<p><span class="versionmodified added">New in version 0.1.1.</span></p>
96+
</div>
9497
<dl class="field-list simple">
9598
<dt class="field-odd">Parameters</dt>
9699
<dd class="field-odd"><dl class="simple">

docs/build/html/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ <h2>Entropy</h2>
128128
<span class="k">print</span><span class="p">(</span><span class="n">svd_entropy</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="mi">3</span><span class="p">,</span> <span class="n">delay</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span> <span class="n">normalize</span><span class="o">=</span><span class="bp">True</span><span class="p">))</span> <span class="c1"># Singular value decomposition entropy</span>
129129
<span class="k">print</span><span class="p">(</span><span class="n">app_entropy</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span> <span class="n">metric</span><span class="o">=</span><span class="s1">&#39;chebyshev&#39;</span><span class="p">))</span> <span class="c1"># Approximate entropy</span>
130130
<span class="k">print</span><span class="p">(</span><span class="n">sample_entropy</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">order</span><span class="o">=</span><span class="mi">2</span><span class="p">,</span> <span class="n">metric</span><span class="o">=</span><span class="s1">&#39;chebyshev&#39;</span><span class="p">))</span> <span class="c1"># Sample entropy</span>
131-
<span class="k">print</span><span class="p">(</span><span class="n">lziv_complexity</span><span class="p">(</span><span class="s1">&#39;01111000011001&#39;</span><span class="p">,</span> <span class="n">normalize</span><span class="o">=</span><span class="bp">True</span><span class="p">))</span> <span class="c1"># Lempel-Ziv complexity</span>
131+
<span class="k">print</span><span class="p">(</span><span class="n">lziv_complexity</span><span class="p">(</span><span class="s1">&#39;01111000011001&#39;</span><span class="p">,</span> <span class="n">normalize</span><span class="o">=</span><span class="bp">True</span><span class="p">))</span> <span class="c1"># Lempel-Ziv complexity</span>
132132
</pre></div>
133133
</div>
134134
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="mf">0.9995858289645746</span>
@@ -173,7 +173,6 @@ <h1>Execution time</h1>
173173
<span class="o">%</span><span class="n">timeit</span> <span class="n">petrosian_fd</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
174174
<span class="o">%</span><span class="n">timeit</span> <span class="n">katz_fd</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
175175
<span class="o">%</span><span class="n">timeit</span> <span class="n">higuchi_fd</span><span class="p">(</span><span class="n">x</span><span class="p">)</span> <span class="c1"># Numba (fast)</span>
176-
<span class="c1"># Other</span>
177176
<span class="o">%</span><span class="n">timeit</span> <span class="n">detrended_fluctuation</span><span class="p">(</span><span class="n">x</span><span class="p">)</span> <span class="c1"># Numba (fast)</span>
178177
</pre></div>
179178
</div>
@@ -197,7 +196,7 @@ <h1>Development</h1>
197196
</div>
198197
<div class="section" id="acknowledgement">
199198
<h1>Acknowledgement</h1>
200-
<p>Several functions of EntroPy were borrowed from:</p>
199+
<p>Several functions of EntroPy were adapted from:</p>
201200
<ul class="simple">
202201
<li><p>MNE-features: <a class="reference external" href="https://github.com/mne-tools/mne-features">https://github.com/mne-tools/mne-features</a></p></li>
203202
<li><p>pyEntropy: <a class="reference external" href="https://github.com/nikdon/pyEntropy">https://github.com/nikdon/pyEntropy</a></p></li>

docs/build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Entropy
5858
print(svd_entropy(x, order=3, delay=1, normalize=True)) # Singular value decomposition entropy
5959
print(app_entropy(x, order=2, metric='chebyshev')) # Approximate entropy
6060
print(sample_entropy(x, order=2, metric='chebyshev')) # Sample entropy
61-
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
61+
print(lziv_complexity('01111000011001', normalize=True)) # Lempel-Ziv complexity
6262
6363
.. parsed-literal::
6464
@@ -107,7 +107,6 @@ Here are some benchmarks computed on an average PC (i7-7700HQ CPU @ 2.80 Ghz - 8
107107
%timeit petrosian_fd(x)
108108
%timeit katz_fd(x)
109109
%timeit higuchi_fd(x) # Numba (fast)
110-
# Other
111110
%timeit detrended_fluctuation(x) # Numba (fast)
112111
113112
.. parsed-literal::
@@ -134,7 +133,7 @@ Note that this program is provided with NO WARRANTY OF ANY KIND. If you can, alw
134133
Acknowledgement
135134
===============
136135

137-
Several functions of EntroPy were borrowed from:
136+
Several functions of EntroPy were adapted from:
138137

139138
- MNE-features: https://github.com/mne-tools/mne-features
140139
- pyEntropy: https://github.com/nikdon/pyEntropy

entropy/entropy.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,8 @@ def lziv_complexity(binary_sequence, normalize=False):
506506
"""
507507
Lempel-Ziv (LZ) complexity of binary sequence.
508508
509+
.. versionadded:: 0.1.1
510+
509511
Parameters
510512
----------
511513
binary_sequence : str or array

0 commit comments

Comments
 (0)