Skip to content

Commit 0cb1b6d

Browse files
toni-heittolatoni-heittola
authored
Merge pull request #13 from TUT-ARG/develop
Merge for ver 0.2.1
2 parents f01d6fb + df2d89e commit 0cb1b6d

File tree

134 files changed

+9597
-2771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+9597
-2771
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
language:
22
- python
3+
34
python:
45
- "2.7"
56
- "3.5"
67
- "3.6"
78

9+
cache:
10+
pip: true
11+
bundler: true
12+
813
notifications:
914
email: false
1015

11-
#virtualenv:
12-
# system_site_packages: true
13-
1416
before_install:
1517
- "sudo apt-get install -qq python-scipy"
1618

1719
# command to install dependencies
1820
install:
19-
#- "mkdir tests/dcase2016/"
20-
#- "cd tests/dcase2016/"
21-
#- "wget https://github.com/TUT-ARG/DCASE2016-baseline-system-python/archive/v1.0.6.zip"
22-
#- "unzip v1.0.6.zip"
23-
#- "cd ../../"
2421
- "pip install -r requirements.txt"
2522
- "pip install python-coveralls"
2623
- "pip install coveralls"
2724
- "pip install nose"
2825
- "pip install scikit-learn"
26+
- "pip install 'joblib==0.11' --force-reinstall"
2927
- "python setup.py develop"
3028

3129
# command to run tests

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Dependencies
5151
The toolbox is tested to work with Python 2.7 and Python 3.6.
5252

5353
- numpy >= 1.7.0
54-
- dcase_util >= 0.1.6
54+
- dcase_util >= 0.2.4
5555

5656
Citing
5757
======

‎docs/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 4c7e5b0d9b52ec13b3220d847b1a823f
3+
config: 950eb7edc6fd5559b7dbbc2ae8b0df21
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/_modules/index.html‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414

1515

16+
17+
1618

1719

1820

@@ -44,6 +46,7 @@
4446

4547
<body class="wy-body-for-nav" role="document">
4648

49+
4750
<div class="wy-grid-for-nav">
4851

4952

@@ -80,7 +83,10 @@
8083

8184

8285

83-
<ul>
86+
87+
88+
89+
<ul>
8490
<li class="toctree-l1"><a class="reference internal" href="../install.html">Installation instructions</a><ul>
8591
<li class="toctree-l2"><a class="reference internal" href="../install.html#using-pip">Using pip</a></li>
8692
<li class="toctree-l2"><a class="reference internal" href="../install.html#using-setyp-py">Using <code class="docutils literal"><span class="pre">setyp.py</span></code></a></li>
@@ -223,6 +229,10 @@
223229
<li class="toctree-l3"><a class="reference internal" href="../generated/sed_eval.util.scene_list.unique_scene_labels.html">sed_eval.util.scene_list.unique_scene_labels</a></li>
224230
</ul>
225231
</li>
232+
<li class="toctree-l2"><a class="reference internal" href="../util.html#event-matching-operations">Event matching operations</a><ul>
233+
<li class="toctree-l3"><a class="reference internal" href="../generated/sed_eval.util.event_matching.bipartite_match.html">sed_eval.util.event_matching.bipartite_match</a></li>
234+
</ul>
235+
</li>
226236
</ul>
227237
</li>
228238
<li class="toctree-l1"><a class="reference internal" href="../io.html">I/O</a><ul>
@@ -255,8 +265,10 @@
255265

256266

257267
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
258-
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
259-
<a href="../index.html">sed_eval</a>
268+
269+
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
270+
<a href="../index.html">sed_eval</a>
271+
260272
</nav>
261273

262274

@@ -269,17 +281,34 @@
269281

270282

271283

284+
285+
286+
287+
288+
289+
290+
291+
292+
293+
272294
<div role="navigation" aria-label="breadcrumbs navigation">
295+
273296
<ul class="wy-breadcrumbs">
274-
<li><a href="../index.html">Docs</a> &raquo;</li>
275-
276-
<li>Overview: module code</li>
297+
298+
<li><a href="../index.html">Docs</a> &raquo;</li>
299+
300+
<li>Overview: module code</li>
301+
302+
277303
<li class="wy-breadcrumbs-aside">
278304

279-
305+
280306

281307
</li>
308+
282309
</ul>
310+
311+
283312
<hr/>
284313
</div>
285314
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
@@ -293,10 +322,14 @@ <h1>All modules for which code is available</h1>
293322
<li><a href="sed_eval/sound_event.html">sed_eval.sound_event</a></li>
294323
<li><a href="sed_eval/test.html">sed_eval.test</a></li>
295324
<li><a href="sed_eval/util/event_list.html">sed_eval.util.event_list</a></li>
325+
<li><a href="sed_eval/util/event_matching.html">sed_eval.util.event_matching</a></li>
296326
<li><a href="sed_eval/util/event_roll.html">sed_eval.util.event_roll</a></li>
297327
<li><a href="sed_eval/util/scene_list.html">sed_eval.util.scene_list</a></li>
298328
</ul>
299329

330+
</div>
331+
<div class="articleComments">
332+
300333
</div>
301334
</div>
302335
<footer>
@@ -306,7 +339,7 @@ <h1>All modules for which code is available</h1>
306339

307340
<div role="contentinfo">
308341
<p>
309-
&copy; Copyright 2017, Toni Heittola et al..
342+
&copy; Copyright 2018, Toni Heittola et al..
310343

311344
</p>
312345
</div>
@@ -330,7 +363,8 @@ <h1>All modules for which code is available</h1>
330363
VERSION:'0.1',
331364
COLLAPSE_INDEX:false,
332365
FILE_SUFFIX:'.html',
333-
HAS_SOURCE: true
366+
HAS_SOURCE: true,
367+
SOURCELINK_SUFFIX: '.txt'
334368
};
335369
</script>
336370
<script type="text/javascript" src="../_static/jquery.js"></script>

‎docs/_modules/sed_eval/audio_tag.html‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414

1515

16+
17+
1618

1719

1820

@@ -45,6 +47,7 @@
4547

4648
<body class="wy-body-for-nav" role="document">
4749

50+
4851
<div class="wy-grid-for-nav">
4952

5053

@@ -81,7 +84,10 @@
8184

8285

8386

84-
<ul>
87+
88+
89+
90+
<ul>
8591
<li class="toctree-l1"><a class="reference internal" href="../../install.html">Installation instructions</a><ul>
8692
<li class="toctree-l2"><a class="reference internal" href="../../install.html#using-pip">Using pip</a></li>
8793
<li class="toctree-l2"><a class="reference internal" href="../../install.html#using-setyp-py">Using <code class="docutils literal"><span class="pre">setyp.py</span></code></a></li>
@@ -224,6 +230,10 @@
224230
<li class="toctree-l3"><a class="reference internal" href="../../generated/sed_eval.util.scene_list.unique_scene_labels.html">sed_eval.util.scene_list.unique_scene_labels</a></li>
225231
</ul>
226232
</li>
233+
<li class="toctree-l2"><a class="reference internal" href="../../util.html#event-matching-operations">Event matching operations</a><ul>
234+
<li class="toctree-l3"><a class="reference internal" href="../../generated/sed_eval.util.event_matching.bipartite_match.html">sed_eval.util.event_matching.bipartite_match</a></li>
235+
</ul>
236+
</li>
227237
</ul>
228238
</li>
229239
<li class="toctree-l1"><a class="reference internal" href="../../io.html">I/O</a><ul>
@@ -256,8 +266,10 @@
256266

257267

258268
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
259-
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
260-
<a href="../../index.html">sed_eval</a>
269+
270+
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
271+
<a href="../../index.html">sed_eval</a>
272+
261273
</nav>
262274

263275

@@ -270,19 +282,36 @@
270282

271283

272284

285+
286+
287+
288+
289+
290+
291+
292+
293+
294+
273295
<div role="navigation" aria-label="breadcrumbs navigation">
296+
274297
<ul class="wy-breadcrumbs">
275-
<li><a href="../../index.html">Docs</a> &raquo;</li>
276-
298+
299+
<li><a href="../../index.html">Docs</a> &raquo;</li>
300+
277301
<li><a href="../index.html">Module code</a> &raquo;</li>
278-
279-
<li>sed_eval.audio_tag</li>
302+
303+
<li>sed_eval.audio_tag</li>
304+
305+
280306
<li class="wy-breadcrumbs-aside">
281307

282-
308+
283309

284310
</li>
311+
285312
</ul>
313+
314+
286315
<hr/>
287316
</div>
288317
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
@@ -314,7 +343,7 @@ <h1>Source code for sed_eval.audio_tag</h1><div class="highlight"><pre>
314343
<span class="sd"> import sed_eval</span>
315344
<span class="sd"> import dcase_util</span>
316345

317-
<span class="sd"> reference_tag_list = dcase_util.containers.MetaDataContainer([</span>
346+
<span class="sd"> reference_tag_list = dcase_util.containers.MetaDataContainer([</span>
318347
<span class="sd"> {</span>
319348
<span class="sd"> &#39;filename&#39;: &#39;test1.wav&#39;,</span>
320349
<span class="sd"> &#39;tags&#39;: &#39;cat,dog&#39;</span>
@@ -1123,6 +1152,9 @@ <h1>Source code for sed_eval.audio_tag</h1><div class="highlight"><pre>
11231152
<span class="k">return</span> <span class="n">output</span></div></div>
11241153
</pre></div>
11251154

1155+
</div>
1156+
<div class="articleComments">
1157+
11261158
</div>
11271159
</div>
11281160
<footer>
@@ -1132,7 +1164,7 @@ <h1>Source code for sed_eval.audio_tag</h1><div class="highlight"><pre>
11321164

11331165
<div role="contentinfo">
11341166
<p>
1135-
&copy; Copyright 2017, Toni Heittola et al..
1167+
&copy; Copyright 2018, Toni Heittola et al..
11361168

11371169
</p>
11381170
</div>
@@ -1156,7 +1188,8 @@ <h1>Source code for sed_eval.audio_tag</h1><div class="highlight"><pre>
11561188
VERSION:'0.1',
11571189
COLLAPSE_INDEX:false,
11581190
FILE_SUFFIX:'.html',
1159-
HAS_SOURCE: true
1191+
HAS_SOURCE: true,
1192+
SOURCELINK_SUFFIX: '.txt'
11601193
};
11611194
</script>
11621195
<script type="text/javascript" src="../../_static/jquery.js"></script>

0 commit comments

Comments
 (0)