Skip to content

Commit

Permalink
Upgrade to 0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Hentschel authored Nov 4, 2020
2 parents 07093fd + ee8b1bf commit 8ba6f0d
Show file tree
Hide file tree
Showing 31 changed files with 1,278 additions and 574 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog
=========

Version 0.4.2
=============

* small bug fixes
* correct computation of chord tones for new DCML syntax elements ``+M``, ``-``, ``^``, and ``v``

Version 0.4.1
=============

Expand Down
Binary file modified docs/build/doctrees/changelog.doctree
View file
Binary file not shown.
Binary file modified docs/build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/build/doctrees/reference.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: adc542c27dd9a87e828eabcc7b6bf5e8
config: 1e75f94ef22557ec387e54c591e602fb
tags: 645f666f9bcd5a90fca523b33c5a78b7
6 changes: 3 additions & 3 deletions docs/build/html/_modules/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &#8212; ms3 None.post0.dev5-geb8c62e.dirty documentation</title>
<title>Overview: module code &#8212; ms3 0.4.1.post0.dev4+g619dcae documentation</title>
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -49,7 +49,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../index.html">ms3 None.post0.dev5-geb8c62e.dirty documentation</a> &#187;</li>
<li><a href="../index.html">ms3 0.4.1.post0.dev4+g619dcae documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
</ul>
Expand Down Expand Up @@ -129,7 +129,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../index.html">ms3 None.post0.dev5-geb8c62e.dirty documentation</a> &#187;</li>
<li><a href="../index.html">ms3 0.4.1.post0.dev4+g619dcae documentation</a> &#187;</li>

<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
</ul>
Expand Down
27 changes: 14 additions & 13 deletions docs/build/html/_modules/ms3/annotations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ms3.annotations &#8212; ms3 None.post0.dev5-geb8c62e.dirty documentation</title>
<title>ms3.annotations &#8212; ms3 0.4.1.post0.dev4+g619dcae documentation</title>
<link rel="stylesheet" href="../../_static/cloud.css" type="text/css" />
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noticia+Text:400,i,b,bi|Open+Sans:400,i,b,bi|Roboto+Mono:400,i,b,bi&amp;display=swap" type="text/css" />
Expand Down Expand Up @@ -49,7 +49,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../../index.html">ms3 None.post0.dev5-geb8c62e.dirty documentation</a> &#187;</li>
<li><a href="../../index.html">ms3 0.4.1.post0.dev4+g619dcae documentation</a> &#187;</li>

<li class="nav-item nav-item-1"><a href="../index.html" accesskey="U">Module code</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">ms3.annotations</a></li>
Expand Down Expand Up @@ -328,7 +328,7 @@ <h1>Source code for ms3.annotations</h1><div class="highlight"><pre>
<span class="k">return</span> <span class="n">res</span></div>


<div class="viewcode-block" id="Annotations.expand_dcml"><a class="viewcode-back" href="../../reference.html#ms3.annotations.Annotations.expand_dcml">[docs]</a> <span class="k">def</span> <span class="nf">expand_dcml</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drop_others</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">warn_about_others</span><span class="o">=</span><span class="kc">True</span><span class="p">):</span>
<div class="viewcode-block" id="Annotations.expand_dcml"><a class="viewcode-back" href="../../reference.html#ms3.annotations.Annotations.expand_dcml">[docs]</a> <span class="k">def</span> <span class="nf">expand_dcml</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drop_others</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">warn_about_others</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
<span class="sd">&quot;&quot;&quot; Expands all labels where the label_type has been inferred as &#39;dcml&#39; and stores the DataFrame in self._expanded.</span>

<span class="sd"> Parameters</span>
Expand All @@ -338,6 +338,8 @@ <h1>Source code for ms3.annotations</h1><div class="highlight"><pre>
<span class="sd"> warn_about_others : :obj:`bool`, optional</span>
<span class="sd"> Set to False to suppress warnings about labels that have not label_type &#39;dcml&#39;.</span>
<span class="sd"> Is automatically set to False if ``drop_others`` is set to False.</span>
<span class="sd"> kwargs</span>
<span class="sd"> Additional arguments are passed to :py:meth:`.get_labels` to define the original representation.</span>

<span class="sd"> Returns</span>
<span class="sd"> -------</span>
Expand All @@ -347,32 +349,31 @@ <h1>Source code for ms3.annotations</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="s1">&#39;dcml&#39;</span> <span class="ow">not</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">regex_dict</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">regex_dict</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">(</span><span class="n">dcml</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">dcml_double_re</span><span class="p">,</span> <span class="o">**</span><span class="bp">self</span><span class="o">.</span><span class="n">regex_dict</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">infer_types</span><span class="p">()</span>
<span class="n">sel</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">df</span><span class="o">.</span><span class="n">label_type</span> <span class="o">==</span> <span class="s1">&#39;dcml&#39;</span>
<span class="n">df</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_labels</span><span class="p">(</span><span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
<span class="n">sel</span> <span class="o">=</span> <span class="n">df</span><span class="o">.</span><span class="n">label_type</span> <span class="o">==</span> <span class="s1">&#39;dcml&#39;</span>
<span class="k">if</span> <span class="ow">not</span> <span class="n">sel</span><span class="o">.</span><span class="n">any</span><span class="p">():</span>
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Score does not contain any DCML harmonic annotations.&quot;</span><span class="p">)</span>
<span class="k">return</span>
<span class="k">if</span> <span class="ow">not</span> <span class="n">drop_others</span><span class="p">:</span>
<span class="n">warn_about_others</span> <span class="o">=</span> <span class="kc">False</span>
<span class="k">if</span> <span class="n">warn_about_others</span> <span class="ow">and</span> <span class="p">(</span><span class="o">~</span><span class="n">sel</span><span class="p">)</span><span class="o">.</span><span class="n">any</span><span class="p">():</span>
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Score contains </span><span class="si">{</span><span class="p">(</span><span class="o">~</span><span class="n">sel</span><span class="p">)</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span><span class="si">}</span><span class="s2"> labels that don&#39;t (and </span><span class="si">{</span><span class="n">sel</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span><span class="si">}</span><span class="s2"> that do) match the DCML standard:</span><span class="se">\n</span><span class="si">{</span><span class="n">decode_harmonies</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">df</span><span class="p">[</span><span class="o">~</span><span class="n">sel</span><span class="p">],</span> <span class="n">keep_type</span><span class="o">=</span><span class="kc">True</span><span class="p">)[[</span><span class="s1">&#39;mc&#39;</span><span class="p">,</span> <span class="s1">&#39;mn&#39;</span><span class="p">,</span> <span class="s1">&#39;label&#39;</span><span class="p">,</span> <span class="s1">&#39;label_type&#39;</span><span class="p">]]</span><span class="o">.</span><span class="n">to_string</span><span class="p">()</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
<span class="n">df</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">df</span><span class="p">[</span><span class="n">sel</span><span class="p">]</span>
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Score contains </span><span class="si">{</span><span class="p">(</span><span class="o">~</span><span class="n">sel</span><span class="p">)</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span><span class="si">}</span><span class="s2"> labels that don&#39;t (and </span><span class="si">{</span><span class="n">sel</span><span class="o">.</span><span class="n">sum</span><span class="p">()</span><span class="si">}</span><span class="s2"> that do) match the DCML standard:</span><span class="se">\n</span><span class="si">{</span><span class="n">decode_harmonies</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="o">~</span><span class="n">sel</span><span class="p">],</span> <span class="n">keep_type</span><span class="o">=</span><span class="kc">True</span><span class="p">)[[</span><span class="s1">&#39;mc&#39;</span><span class="p">,</span> <span class="s1">&#39;mn&#39;</span><span class="p">,</span> <span class="s1">&#39;label&#39;</span><span class="p">,</span> <span class="s1">&#39;label_type&#39;</span><span class="p">]]</span><span class="o">.</span><span class="n">to_string</span><span class="p">()</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
<span class="n">df</span> <span class="o">=</span> <span class="n">df</span><span class="p">[</span><span class="n">sel</span><span class="p">]</span>
<span class="k">try</span><span class="p">:</span>
<span class="n">exp</span> <span class="o">=</span> <span class="n">expand_labels</span><span class="p">(</span><span class="n">df</span><span class="p">,</span> <span class="n">column</span><span class="o">=</span><span class="s1">&#39;label&#39;</span><span class="p">,</span> <span class="n">regex</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">dcml_re</span><span class="p">,</span> <span class="n">chord_tones</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="p">)</span>
<span class="k">if</span> <span class="n">drop_others</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span> <span class="o">=</span> <span class="n">exp</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">df</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">df</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
<span class="n">df</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">sel</span><span class="p">,</span> <span class="n">exp</span><span class="o">.</span><span class="n">df</span><span class="o">.</span><span class="n">columns</span><span class="p">]</span> <span class="o">=</span> <span class="n">exp</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span> <span class="o">=</span> <span class="n">df</span>
<span class="k">if</span> <span class="s1">&#39;label_type&#39;</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span><span class="o">.</span><span class="n">columns</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span><span class="o">.</span><span class="n">drop</span><span class="p">(</span><span class="n">columns</span><span class="o">=</span><span class="s1">&#39;label_type&#39;</span><span class="p">,</span> <span class="n">inplace</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<span class="k">except</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Expanding labels failed with the following error:</span><span class="se">\n</span><span class="si">{</span><span class="n">sys</span><span class="o">.</span><span class="n">exc_info</span><span class="p">()[</span><span class="mi">1</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span></div>

<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span></div>

<span class="nd">@property</span>
<span class="k">def</span> <span class="nf">expanded</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">expand_dcml</span><span class="p">()</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_expanded</span>


<span class="k">def</span> <span class="nf">infer_mc_from_mn</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">mscx_obj</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
Expand Down Expand Up @@ -492,7 +493,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../../py-modindex.html" title="Python Module Index"
>modules</a> &nbsp; &nbsp;</li>
<li><a href="../../index.html">ms3 None.post0.dev5-geb8c62e.dirty documentation</a> &#187;</li>
<li><a href="../../index.html">ms3 0.4.1.post0.dev4+g619dcae documentation</a> &#187;</li>

<li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
<li class="nav-item nav-item-this"><a href="">ms3.annotations</a></li>
Expand Down
Loading

0 comments on commit 8ba6f0d

Please sign in to comment.