Commit da6ffc94 authored by Anthony Larcher's avatar Anthony Larcher
Browse files

modification in documentation

parent 36515bd5
......@@ -25,13 +25,7 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<<<<<<< HEAD
<link rel="search" title="Search" href="../search.html" />
<link rel="top" title="SIDEKIT documentation" href="../index.html" />
<link rel="up" title="Module code" href="index.html" />
=======
<link rel="search" title="Search" href="../search.html" />
>>>>>>> dev
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
......@@ -110,7 +104,7 @@
<span class="n">__license__</span> <span class="o">=</span> <span class="s2">&quot;LGPL&quot;</span>
<span class="n">__author__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher &amp; Sylvain Meignier&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2016 Anthony Larcher&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2017 Anthony Larcher&quot;</span>
<span class="n">__maintainer__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher&quot;</span>
<span class="n">__email__</span> <span class="o">=</span> <span class="s2">&quot;anthony.larcher@univ-lemans.fr&quot;</span>
<span class="n">__status__</span> <span class="o">=</span> <span class="s2">&quot;Production&quot;</span>
......@@ -265,11 +259,7 @@
<span class="k">return</span> <span class="n">ch</span>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.post_processing"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.post_processing">[docs]</a> <span class="k">def</span> <span class="nf">post_processing</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">label</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_std</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.post_processing"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.post_processing">[docs]</a> <span class="k">def</span> <span class="nf">post_processing</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">label</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_std</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> After cepstral coefficients, filter banks or bottleneck parameters are computed or read from file</span>
<span class="sd"> post processing is applied.</span>
......@@ -393,11 +383,7 @@
<span class="n">label</span><span class="p">[:</span><span class="mi">2</span><span class="p">]</span> <span class="o">=</span> <span class="n">label</span><span class="p">[</span><span class="mi">2</span><span class="p">]</span>
<span class="k">return</span> <span class="n">cep</span><span class="p">,</span> <span class="n">label</span>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.get_context"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.get_context">[docs]</a> <span class="k">def</span> <span class="nf">get_context</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.get_context"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.get_context">[docs]</a> <span class="k">def</span> <span class="nf">get_context</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Add a left annd right context to each frame.</span>
<span class="sd"> First and last frames are duplicated to provide context at the begining and at the end</span>
......@@ -428,11 +414,7 @@
<span class="k">return</span> <span class="n">context_feat</span><span class="p">,</span> <span class="n">context_label</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.get_traps"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.get_traps">[docs]</a> <span class="k">def</span> <span class="nf">get_traps</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.get_traps"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.get_traps">[docs]</a> <span class="k">def</span> <span class="nf">get_traps</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">feat</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Compute TRAP parameters. The input frames are concatenated to add their left and right context,</span>
<span class="sd"> a Hamming window is applied and a DCT reduces the dimensionality of the resulting vector.</span>
......@@ -472,11 +454,7 @@
<span class="n">hamming_dct</span>
<span class="p">)</span><span class="o">.</span><span class="n">reshape</span><span class="p">(</span><span class="n">context_feat</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="o">-</span><span class="mi">1</span><span class="p">),</span> <span class="n">context_label</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.load"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.load">[docs]</a> <span class="k">def</span> <span class="nf">load</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">input_feature_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.load"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.load">[docs]</a> <span class="k">def</span> <span class="nf">load</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">input_feature_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Depending of the setting of the FeaturesServer, can either:</span>
......@@ -510,11 +488,7 @@
<span class="bp">self</span><span class="o">.</span><span class="n">show</span> <span class="o">=</span> <span class="n">show</span>
<span class="bp">self</span><span class="o">.</span><span class="n">input_feature_filename</span> <span class="o">=</span> <span class="n">input_feature_filename</span>
<span class="bp">self</span><span class="o">.</span><span class="n">start_stop</span> <span class="o">=</span> <span class="p">(</span><span class="n">start</span><span class="p">,</span> <span class="n">stop</span><span class="p">)</span>
<<<<<<< HEAD
=======
>>>>>>> dev
<span class="n">feature_filename</span> <span class="o">=</span> <span class="kc">None</span>
<span class="k">if</span> <span class="n">input_feature_filename</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">feature_filename_structure</span> <span class="o">=</span> <span class="n">input_feature_filename</span>
......@@ -534,11 +508,7 @@
<span class="n">start</span><span class="o">=</span><span class="n">start</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="n">stop</span><span class="p">)</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">previous_load</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.get_features"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.get_features">[docs]</a> <span class="k">def</span> <span class="nf">get_features</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">input_feature_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.get_features"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.get_features">[docs]</a> <span class="k">def</span> <span class="nf">get_features</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">input_feature_filename</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Get the datasets from a single HDF5 file</span>
<span class="sd"> The HDF5 file is loaded from disk or processed on the fly</span>
......@@ -628,11 +598,7 @@
<span class="k">return</span> <span class="n">feat</span><span class="p">,</span> <span class="n">label</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.get_tandem_features"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.get_tandem_features">[docs]</a> <span class="k">def</span> <span class="nf">get_tandem_features</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.get_tandem_features"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.get_tandem_features">[docs]</a> <span class="k">def</span> <span class="nf">get_tandem_features</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Read acoustic parameters from multiple HDF5 files (from disk or extracted by FeaturesExtractor objects).</span>
......@@ -662,11 +628,7 @@
<span class="c1"># Apply the final post-processing on the concatenated features</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">post_processing</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="p">)</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="FeaturesServer.mean_std"><a class="viewcode-back" href="../featuresserver.html#features_server.FeaturesServer.mean_std">[docs]</a> <span class="k">def</span> <span class="nf">mean_std</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="FeaturesServer.mean_std"><a class="viewcode-back" href="../api/featuresserver.html#features_server.FeaturesServer.mean_std">[docs]</a> <span class="k">def</span> <span class="nf">mean_std</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">show</span><span class="p">,</span> <span class="n">channel</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">start</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">stop</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Compute the mean and standard deviation vectors for a segment of acoustic features</span>
......@@ -824,11 +786,7 @@
</div>
<div class="footer" role="contentinfo">
&#169; Copyright 2014-16, Anthony LARCHER &amp; Sylvain MEIGNIER &amp; Kong Aik LEE.
<<<<<<< HEAD
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.8.
=======
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.5.1.
>>>>>>> dev
</div>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
......@@ -25,13 +25,7 @@
<script type="text/javascript" src="../../_static/underscore.js"></script>
<script type="text/javascript" src="../../_static/doctools.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<<<<<<< HEAD
<link rel="search" title="Search" href="../../search.html" />
<link rel="top" title="SIDEKIT documentation" href="../../index.html" />
<link rel="up" title="Module code" href="../index.html" />
=======
<link rel="search" title="Search" href="../../search.html" />
>>>>>>> dev
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
......@@ -104,7 +98,7 @@
<span class="n">__author__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher and Sylvain Meignier&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2016 Anthony Larcher and Sylvain Meignier&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2017 Anthony Larcher and Sylvain Meignier&quot;</span>
<span class="n">__license__</span> <span class="o">=</span> <span class="s2">&quot;LGPL&quot;</span>
<span class="n">__maintainer__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher&quot;</span>
<span class="n">__email__</span> <span class="o">=</span> <span class="s2">&quot;anthony.larcher@univ-lemans.fr&quot;</span>
......@@ -144,11 +138,7 @@
<span class="k">return</span> <span class="n">y</span><span class="o">.</span><span class="n">T</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="cms"><a class="viewcode-back" href="../../frontend/normfeat.html#frontend.normfeat.cms">[docs]</a><span class="k">def</span> <span class="nf">cms</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="cms"><a class="viewcode-back" href="../../api/frontend/normfeat.html#frontend.normfeat.cms">[docs]</a><span class="k">def</span> <span class="nf">cms</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;Performs cepstral mean subtraction</span>
<span class="sd"> </span>
<span class="sd"> :param features: a feature stream of dimension dim x nframes </span>
......@@ -171,11 +161,7 @@
<span class="n">features</span> <span class="o">-=</span> <span class="n">mu</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="cmvn"><a class="viewcode-back" href="../../frontend/normfeat.html#frontend.normfeat.cmvn">[docs]</a><span class="k">def</span> <span class="nf">cmvn</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_std</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="cmvn"><a class="viewcode-back" href="../../api/frontend/normfeat.html#frontend.normfeat.cmvn">[docs]</a><span class="k">def</span> <span class="nf">cmvn</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_mean</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">global_std</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;Performs mean and variance normalization</span>
<span class="sd"> </span>
<span class="sd"> :param features: a feature stream of dimension dim x nframes </span>
......@@ -204,11 +190,7 @@
<span class="n">features</span> <span class="o">/=</span> <span class="n">stdev</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="stg"><a class="viewcode-back" href="../../frontend/normfeat.html#frontend.normfeat.stg">[docs]</a><span class="k">def</span> <span class="nf">stg</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">win</span><span class="o">=</span><span class="mi">301</span><span class="p">):</span>
=======
<div class="viewcode-block" id="stg"><a class="viewcode-back" href="../../api/frontend/normfeat.html#frontend.normfeat.stg">[docs]</a><span class="k">def</span> <span class="nf">stg</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">win</span><span class="o">=</span><span class="mi">301</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;Performs feature warping on a sliding window</span>
<span class="sd"> </span>
<span class="sd"> :param features: a feature stream of dimension dim x nframes </span>
......@@ -272,11 +254,7 @@
<span class="n">features</span><span class="p">[</span><span class="n">label</span><span class="p">,</span> <span class="p">:]</span> <span class="o">=</span> <span class="n">stg_features</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="cep_sliding_norm"><a class="viewcode-back" href="../../frontend/normfeat.html#frontend.normfeat.cep_sliding_norm">[docs]</a><span class="k">def</span> <span class="nf">cep_sliding_norm</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">win</span><span class="o">=</span><span class="mi">301</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">center</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">reduce</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
=======
<div class="viewcode-block" id="cep_sliding_norm"><a class="viewcode-back" href="../../api/frontend/normfeat.html#frontend.normfeat.cep_sliding_norm">[docs]</a><span class="k">def</span> <span class="nf">cep_sliding_norm</span><span class="p">(</span><span class="n">features</span><span class="p">,</span> <span class="n">win</span><span class="o">=</span><span class="mi">301</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">center</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">reduce</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Performs a cepstal mean substitution and standard deviation normalization</span>
<span class="sd"> in a sliding windows. MFCC is modified.</span>
......@@ -336,11 +314,7 @@
</div>
<div class="footer" role="contentinfo">
&#169; Copyright 2014-16, Anthony LARCHER &amp; Sylvain MEIGNIER &amp; Kong Aik LEE.
<<<<<<< HEAD
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.8.
=======
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.5.1.
>>>>>>> dev
</div>
</body>
</html>
\ No newline at end of file
......@@ -25,13 +25,7 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<<<<<<< HEAD
<link rel="search" title="Search" href="../search.html" />
<link rel="top" title="SIDEKIT documentation" href="../index.html" />
<link rel="up" title="Module code" href="index.html" />
=======
<link rel="search" title="Search" href="../search.html" />
>>>>>>> dev
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
......@@ -111,7 +105,7 @@
<span class="n">__license__</span> <span class="o">=</span> <span class="s2">&quot;LGPL&quot;</span>
<span class="n">__author__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2016 Anthony Larcher&quot;</span>
<span class="n">__copyright__</span> <span class="o">=</span> <span class="s2">&quot;Copyright 2014-2017 Anthony Larcher&quot;</span>
<span class="n">__maintainer__</span> <span class="o">=</span> <span class="s2">&quot;Anthony Larcher&quot;</span>
<span class="n">__email__</span> <span class="o">=</span> <span class="s2">&quot;anthony.larcher@univ-lemans.fr&quot;</span>
<span class="n">__status__</span> <span class="o">=</span> <span class="s2">&quot;Production&quot;</span>
......@@ -130,15 +124,9 @@
<span class="n">data</span> <span class="o">=</span> <span class="n">array</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="s2">&quot;d&quot;</span><span class="p">)</span>
<span class="n">data</span><span class="o">.</span><span class="n">fromstring</span><span class="p">(</span><span class="n">f</span><span class="o">.</span><span class="n">read</span><span class="p">())</span>
<span class="k">return</span> <span class="n">numpy</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">data</span><span class="p">)</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="read_matrix"><a class="viewcode-back" href="../sidekit_io.html#sidekit_io.read_matrix">[docs]</a><span class="k">def</span> <span class="nf">read_matrix</span><span class="p">(</span><span class="n">filename</span><span class="p">):</span>
=======
<div class="viewcode-block" id="read_matrix"><a class="viewcode-back" href="../api/sidekit_io.html#sidekit_io.read_matrix">[docs]</a><span class="k">def</span> <span class="nf">read_matrix</span><span class="p">(</span><span class="n">filename</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;Read matrix in ALIZE binary format and return a ndarray</span>
<span class="sd"> </span>
<span class="sd"> :param filename: name of the file to read from</span>
......@@ -299,15 +287,9 @@
<span class="sd"> &quot;&quot;&quot;</span>
<span class="k">with</span> <span class="n">h5py</span><span class="o">.</span><span class="n">File</span><span class="p">(</span><span class="n">input_filename</span><span class="p">,</span> <span class="s2">&quot;r&quot;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
<span class="k">return</span> <span class="n">f</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">key</span><span class="p">)</span><span class="o">.</span><span class="n">value</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="read_dict_hdf5"><a class="viewcode-back" href="../sidekit_io.html#sidekit_io.read_dict_hdf5">[docs]</a><span class="k">def</span> <span class="nf">read_dict_hdf5</span><span class="p">(</span><span class="n">input_filename</span><span class="p">):</span>
=======
<div class="viewcode-block" id="read_dict_hdf5"><a class="viewcode-back" href="../api/sidekit_io.html#sidekit_io.read_dict_hdf5">[docs]</a><span class="k">def</span> <span class="nf">read_dict_hdf5</span><span class="p">(</span><span class="n">input_filename</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Read a dictionary from an HDF5 file.</span>
......@@ -387,11 +369,7 @@
<span class="n">fletcher32</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<<<<<<< HEAD
<div class="viewcode-block" id="read_plda_hdf5"><a class="viewcode-back" href="../sidekit_io.html#sidekit_io.read_plda_hdf5">[docs]</a><span class="k">def</span> <span class="nf">read_plda_hdf5</span><span class="p">(</span><span class="n">input_filename</span><span class="p">):</span>
=======
<div class="viewcode-block" id="read_plda_hdf5"><a class="viewcode-back" href="../api/sidekit_io.html#sidekit_io.read_plda_hdf5">[docs]</a><span class="k">def</span> <span class="nf">read_plda_hdf5</span><span class="p">(</span><span class="n">input_filename</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Read a PLDA model from a HDF5 file.</span>
......@@ -478,15 +456,9 @@
<span class="k">if</span> <span class="n">kind</span><span class="p">[</span><span class="mi">4</span><span class="p">]</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">:</span>
<span class="n">sigma</span> <span class="o">=</span> <span class="n">fh</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;fa/sigma&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">value</span>
<span class="k">return</span> <span class="n">mean</span><span class="p">,</span> <span class="n">f</span><span class="p">,</span> <span class="n">g</span><span class="p">,</span> <span class="n">h</span><span class="p">,</span> <span class="n">sigma</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="h5merge"><a class="viewcode-back" href="../sidekit_io.html#sidekit_io.h5merge">[docs]</a><span class="k">def</span> <span class="nf">h5merge</span><span class="p">(</span><span class="n">output_filename</span><span class="p">,</span> <span class="n">input_filename_list</span><span class="p">):</span>
=======
<div class="viewcode-block" id="h5merge"><a class="viewcode-back" href="../api/sidekit_io.html#sidekit_io.h5merge">[docs]</a><span class="k">def</span> <span class="nf">h5merge</span><span class="p">(</span><span class="n">output_filename</span><span class="p">,</span> <span class="n">input_filename_list</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Merge a list of HDF5 files into a new one.</span>
......@@ -508,11 +480,7 @@
<span class="n">fo</span><span class="o">.</span><span class="n">create_dataset</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="n">data</span><span class="o">=</span><span class="n">value</span><span class="p">)</span></div>
<<<<<<< HEAD
<div class="viewcode-block" id="init_logging"><a class="viewcode-back" href="../sidekit_io.html#sidekit_io.init_logging">[docs]</a><span class="k">def</span> <span class="nf">init_logging</span><span class="p">(</span><span class="n">level</span><span class="o">=</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">,</span> <span class="n">filename</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
=======
<div class="viewcode-block" id="init_logging"><a class="viewcode-back" href="../api/sidekit_io.html#sidekit_io.init_logging">[docs]</a><span class="k">def</span> <span class="nf">init_logging</span><span class="p">(</span><span class="n">level</span><span class="o">=</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">,</span> <span class="n">filename</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
>>>>>>> dev
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Initialize a logger</span>
......@@ -568,11 +536,7 @@
</div>
<div class="footer" role="contentinfo">
&#169; Copyright 2014-16, Anthony LARCHER &amp; Sylvain MEIGNIER &amp; Kong Aik LEE.
<<<<<<< HEAD
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.8.
=======
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.5.1.
>>>>>>> dev
</div>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment