mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-16 07:10:24 +01:00
Documentation updated
This commit is contained in:
fjosw
parent
5a67a1184a
commit
bc044261d8
1 changed files with 32 additions and 16 deletions
|
|
@ -516,7 +516,7 @@
|
|||
<span class="k">if</span> <span class="n">cnfg_no</span> <span class="o">></span> <span class="n">kwargs</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">'stop'</span><span class="p">):</span>
|
||||
<span class="k">break</span>
|
||||
<span class="n">idl</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">cnfg_no</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span> <span class="o">+</span> <span class="mi">1</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
|
||||
<span class="n">no_corrs</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">corr_name</span><span class="p">)</span>
|
||||
<span class="n">data</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
|
|
@ -550,18 +550,26 @@
|
|||
<span class="k">if</span> <span class="n">stop</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
|
||||
<span class="n">stop</span> <span class="o">=</span> <span class="n">idl</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span>
|
||||
<span class="n">idl_target</span> <span class="o">=</span> <span class="nb">range</span><span class="p">(</span><span class="n">start</span><span class="p">,</span> <span class="n">stop</span> <span class="o">+</span> <span class="mi">1</span><span class="p">,</span> <span class="n">step</span><span class="p">)</span>
|
||||
<span class="k">try</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="p">[</span><span class="n">idl</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="n">i</span><span class="p">)</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">idl_target</span><span class="p">]</span>
|
||||
<span class="k">except</span> <span class="ne">ValueError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
|
||||
<span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">'Configurations in file do no match target list!'</span><span class="p">,</span> <span class="n">err</span><span class="p">)</span>
|
||||
|
||||
<span class="k">if</span> <span class="nb">set</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">!=</span> <span class="nb">set</span><span class="p">(</span><span class="n">idl_target</span><span class="p">):</span>
|
||||
<span class="k">try</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="p">[</span><span class="n">idl</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="n">i</span><span class="p">)</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">idl_target</span><span class="p">]</span>
|
||||
<span class="k">except</span> <span class="ne">ValueError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
|
||||
<span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">'Configurations in file do no match target list!'</span><span class="p">,</span> <span class="n">err</span><span class="p">)</span>
|
||||
<span class="k">else</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="kc">None</span>
|
||||
|
||||
<span class="n">result</span> <span class="o">=</span> <span class="p">{}</span>
|
||||
<span class="k">for</span> <span class="n">c</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">no_corrs</span><span class="p">):</span>
|
||||
<span class="n">tmp_corr</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
<span class="n">tmp_data</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">c</span><span class="p">])</span>
|
||||
<span class="k">for</span> <span class="n">t</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">d0</span> <span class="o">-</span> <span class="mi">2</span><span class="p">):</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">c</span><span class="p">])[:,</span> <span class="n">t</span><span class="p">][</span><span class="n">index</span><span class="p">]</span> <span class="k">for</span> <span class="n">index</span> <span class="ow">in</span> <span class="n">indices</span><span class="p">]</span>
|
||||
<span class="k">if</span> <span class="n">indices</span><span class="p">:</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="p">[</span><span class="n">tmp_data</span><span class="p">[:,</span> <span class="n">t</span><span class="p">][</span><span class="n">index</span><span class="p">]</span> <span class="k">for</span> <span class="n">index</span> <span class="ow">in</span> <span class="n">indices</span><span class="p">]</span>
|
||||
<span class="k">else</span><span class="p">:</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="n">tmp_data</span><span class="p">[:,</span> <span class="n">t</span><span class="p">]</span>
|
||||
<span class="n">tmp_corr</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">Obs</span><span class="p">([</span><span class="n">deltas</span><span class="p">],</span> <span class="p">[</span><span class="n">ensemble_name</span><span class="p">],</span> <span class="n">idl</span><span class="o">=</span><span class="p">[</span><span class="n">idl_target</span><span class="p">]))</span>
|
||||
<span class="n">result</span><span class="p">[(</span><span class="n">corr_name</span><span class="p">[</span><span class="n">c</span><span class="p">],</span> <span class="n">corr_source</span><span class="p">[</span><span class="n">c</span><span class="p">])</span> <span class="o">+</span> <span class="nb">tuple</span><span class="p">(</span><span class="nb">sorted</span><span class="p">(</span><span class="n">corr_kappa</span><span class="p">[</span><span class="n">c</span><span class="p">]))]</span> <span class="o">=</span> <span class="n">tmp_corr</span>
|
||||
<span class="n">result</span><span class="p">[(</span><span class="n">corr_name</span><span class="p">[</span><span class="n">c</span><span class="p">],</span> <span class="n">corr_source</span><span class="p">[</span><span class="n">c</span><span class="p">])</span> <span class="o">+</span> <span class="nb">tuple</span><span class="p">(</span><span class="n">corr_kappa</span><span class="p">[</span><span class="n">c</span><span class="p">])]</span> <span class="o">=</span> <span class="n">tmp_corr</span>
|
||||
|
||||
<span class="c1"># Check that all data entries have the same number of configurations</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="nb">set</span><span class="p">([</span><span class="n">o</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">N</span> <span class="k">for</span> <span class="n">o</span> <span class="ow">in</span> <span class="nb">list</span><span class="p">(</span><span class="n">result</span><span class="o">.</span><span class="n">values</span><span class="p">())]))</span> <span class="o">!=</span> <span class="mi">1</span><span class="p">:</span>
|
||||
|
|
@ -709,7 +717,7 @@
|
|||
<span class="k">if</span> <span class="n">cnfg_no</span> <span class="o">></span> <span class="n">kwargs</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">'stop'</span><span class="p">):</span>
|
||||
<span class="k">break</span>
|
||||
<span class="n">idl</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">cnfg_no</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span> <span class="o">+</span> <span class="mi">1</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
|
||||
<span class="n">no_corrs</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">corr_name</span><span class="p">)</span>
|
||||
<span class="n">data</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
|
|
@ -1250,7 +1258,7 @@ adding the flag -fPIC to CC and changing the all target to</p>
|
|||
<span class="k">if</span> <span class="n">cnfg_no</span> <span class="o">></span> <span class="n">kwargs</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">'stop'</span><span class="p">):</span>
|
||||
<span class="k">break</span>
|
||||
<span class="n">idl</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">cnfg_no</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span> <span class="o">+</span> <span class="mi">1</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
|
||||
<span class="n">no_corrs</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">corr_name</span><span class="p">)</span>
|
||||
<span class="n">data</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
|
|
@ -1284,18 +1292,26 @@ adding the flag -fPIC to CC and changing the all target to</p>
|
|||
<span class="k">if</span> <span class="n">stop</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
|
||||
<span class="n">stop</span> <span class="o">=</span> <span class="n">idl</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span>
|
||||
<span class="n">idl_target</span> <span class="o">=</span> <span class="nb">range</span><span class="p">(</span><span class="n">start</span><span class="p">,</span> <span class="n">stop</span> <span class="o">+</span> <span class="mi">1</span><span class="p">,</span> <span class="n">step</span><span class="p">)</span>
|
||||
<span class="k">try</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="p">[</span><span class="n">idl</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="n">i</span><span class="p">)</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">idl_target</span><span class="p">]</span>
|
||||
<span class="k">except</span> <span class="ne">ValueError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
|
||||
<span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">'Configurations in file do no match target list!'</span><span class="p">,</span> <span class="n">err</span><span class="p">)</span>
|
||||
|
||||
<span class="k">if</span> <span class="nb">set</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">!=</span> <span class="nb">set</span><span class="p">(</span><span class="n">idl_target</span><span class="p">):</span>
|
||||
<span class="k">try</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="p">[</span><span class="n">idl</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="n">i</span><span class="p">)</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">idl_target</span><span class="p">]</span>
|
||||
<span class="k">except</span> <span class="ne">ValueError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
|
||||
<span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s1">'Configurations in file do no match target list!'</span><span class="p">,</span> <span class="n">err</span><span class="p">)</span>
|
||||
<span class="k">else</span><span class="p">:</span>
|
||||
<span class="n">indices</span> <span class="o">=</span> <span class="kc">None</span>
|
||||
|
||||
<span class="n">result</span> <span class="o">=</span> <span class="p">{}</span>
|
||||
<span class="k">for</span> <span class="n">c</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">no_corrs</span><span class="p">):</span>
|
||||
<span class="n">tmp_corr</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
<span class="n">tmp_data</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">c</span><span class="p">])</span>
|
||||
<span class="k">for</span> <span class="n">t</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">d0</span> <span class="o">-</span> <span class="mi">2</span><span class="p">):</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">asarray</span><span class="p">(</span><span class="n">data</span><span class="p">[</span><span class="n">c</span><span class="p">])[:,</span> <span class="n">t</span><span class="p">][</span><span class="n">index</span><span class="p">]</span> <span class="k">for</span> <span class="n">index</span> <span class="ow">in</span> <span class="n">indices</span><span class="p">]</span>
|
||||
<span class="k">if</span> <span class="n">indices</span><span class="p">:</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="p">[</span><span class="n">tmp_data</span><span class="p">[:,</span> <span class="n">t</span><span class="p">][</span><span class="n">index</span><span class="p">]</span> <span class="k">for</span> <span class="n">index</span> <span class="ow">in</span> <span class="n">indices</span><span class="p">]</span>
|
||||
<span class="k">else</span><span class="p">:</span>
|
||||
<span class="n">deltas</span> <span class="o">=</span> <span class="n">tmp_data</span><span class="p">[:,</span> <span class="n">t</span><span class="p">]</span>
|
||||
<span class="n">tmp_corr</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">Obs</span><span class="p">([</span><span class="n">deltas</span><span class="p">],</span> <span class="p">[</span><span class="n">ensemble_name</span><span class="p">],</span> <span class="n">idl</span><span class="o">=</span><span class="p">[</span><span class="n">idl_target</span><span class="p">]))</span>
|
||||
<span class="n">result</span><span class="p">[(</span><span class="n">corr_name</span><span class="p">[</span><span class="n">c</span><span class="p">],</span> <span class="n">corr_source</span><span class="p">[</span><span class="n">c</span><span class="p">])</span> <span class="o">+</span> <span class="nb">tuple</span><span class="p">(</span><span class="nb">sorted</span><span class="p">(</span><span class="n">corr_kappa</span><span class="p">[</span><span class="n">c</span><span class="p">]))]</span> <span class="o">=</span> <span class="n">tmp_corr</span>
|
||||
<span class="n">result</span><span class="p">[(</span><span class="n">corr_name</span><span class="p">[</span><span class="n">c</span><span class="p">],</span> <span class="n">corr_source</span><span class="p">[</span><span class="n">c</span><span class="p">])</span> <span class="o">+</span> <span class="nb">tuple</span><span class="p">(</span><span class="n">corr_kappa</span><span class="p">[</span><span class="n">c</span><span class="p">])]</span> <span class="o">=</span> <span class="n">tmp_corr</span>
|
||||
|
||||
<span class="c1"># Check that all data entries have the same number of configurations</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="nb">set</span><span class="p">([</span><span class="n">o</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">N</span> <span class="k">for</span> <span class="n">o</span> <span class="ow">in</span> <span class="nb">list</span><span class="p">(</span><span class="n">result</span><span class="o">.</span><span class="n">values</span><span class="p">())]))</span> <span class="o">!=</span> <span class="mi">1</span><span class="p">:</span>
|
||||
|
|
@ -1486,7 +1502,7 @@ Manually overwrite ensemble name</li>
|
|||
<span class="k">if</span> <span class="n">cnfg_no</span> <span class="o">></span> <span class="n">kwargs</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">'stop'</span><span class="p">):</span>
|
||||
<span class="k">break</span>
|
||||
<span class="n">idl</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">cnfg_no</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span> <span class="o">+</span> <span class="mi">1</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="nb">print</span><span class="p">(</span><span class="s1">'</span><span class="se">\r</span><span class="si">%s</span><span class="s1"> </span><span class="si">%i</span><span class="s1">'</span> <span class="o">%</span> <span class="p">(</span><span class="s1">'Reading configuration'</span><span class="p">,</span> <span class="n">cnfg_no</span><span class="p">),</span> <span class="n">end</span><span class="o">=</span><span class="s1">'</span><span class="se">\r</span><span class="s1">'</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">idl</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
|
||||
<span class="n">no_corrs</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">corr_name</span><span class="p">)</span>
|
||||
<span class="n">data</span> <span class="o">=</span> <span class="p">[]</span>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue