Changeset 1998 for sphinxdocs/build/html/_modules/testDeriv.html

Timestamp:

Oct 10, 2015 9:59:34 PM (10 years ago)

Author:

toby

Message:

rebuild docs

File:

• sphinxdocs/build/html/_modules/testDeriv.html (modified) (5 diffs)

sphinxdocs/build/html/_modules/testDeriv.html ¶

@@ -145 +145 @@
                 <span class="bp">self</span><span class="o">.</span><span class="n">values</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">HistoPhases</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
-                <span class="p">(</span><span class="n">G2mv</span><span class="o">.</span><span class="n">dependentParmList</span><span class="p">,</span><span class="n">G2mv</span><span class="o">.</span><span class="n">arrayList</span><span class="p">,</span><span class="n">G2mv</span><span class="o">.</span><span class="n">invarrayList</span><span class="p">,</span><span class="n">G2mv</span><span class="o">.</span><span class="n">indParmList</span><span class="p">,</span>
-                    <span class="n">G2mv</span><span class="o">.</span><span class="n">invarrayList</span><span class="p">)</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
+                <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">constrDict</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">fixedList</span><span class="p">)</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">parmDict</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">varylist</span> <span class="o">=</span> <span class="n">cPickle</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="nb">file</span><span class="p">)</span>
@@ -154 +153 @@
                 <span class="bp">self</span><span class="o">.</span><span class="n">delt</span> <span class="o">=</span> <span class="p">[</span><span class="nb">max</span><span class="p">(</span><span class="nb">abs</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">parmDict</span><span class="p">[</span><span class="n">name</span><span class="p">])</span><span class="o">*</span><span class="mf">0.001</span><span class="p">,</span><span class="mf">1e-6</span><span class="p">)</span> <span class="k">for</span> <span class="n">name</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">varylist</span><span class="p">]</span>
                 <span class="nb">file</span><span class="o">.</span><span class="n">close</span><span class="p">()</span>
+                <span class="n">groups</span><span class="p">,</span><span class="n">parmlist</span> <span class="o">=</span> <span class="n">G2mv</span><span class="o">.</span><span class="n">GroupConstraints</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">constrDict</span><span class="p">)</span>
+                <span class="n">G2mv</span><span class="o">.</span><span class="n">GenerateConstraints</span><span class="p">(</span><span class="n">groups</span><span class="p">,</span><span class="n">parmlist</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">varylist</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">constrDict</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">fixedList</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">parmDict</span><span class="p">)</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">UpdateControls</span><span class="p">(</span><span class="n">event</span><span class="p">)</span>
                 <span class="k">print</span> <span class="n">G2mv</span><span class="o">.</span><span class="n">VarRemapShow</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">varylist</span><span class="p">)</span>
@@ -193 +194 @@
             <span class="n">delVal</span><span class="o">.</span><span class="n">Bind</span><span class="p">(</span><span class="n">wx</span><span class="o">.</span><span class="n">EVT_KILL_FOCUS</span><span class="p">,</span><span class="n">OnDelValue</span><span class="p">)</span>
             <span class="n">mainSizer</span><span class="o">.</span><span class="n">Add</span><span class="p">(</span><span class="n">delVal</span><span class="p">,</span><span class="mi">0</span><span class="p">)</span>
-<span class="c">#        mainSizer.Layout()</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">testDerivPanel</span><span class="o">.</span><span class="n">SetSizer</span><span class="p">(</span><span class="n">mainSizer</span><span class="p">)</span>    
         <span class="n">Size</span> <span class="o">=</span> <span class="n">mainSizer</span><span class="o">.</span><span class="n">Fit</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">testDerivPanel</span><span class="p">)</span>
@@ -212 +212 @@
             
         <span class="k">def</span> <span class="nf">test2</span><span class="p">(</span><span class="n">name</span><span class="p">,</span><span class="n">delt</span><span class="p">):</span>
-            <span class="n">hplot</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">plotNB</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="s">&#39;derivatives test for &#39;</span><span class="o">+</span><span class="n">name</span><span class="p">)</span><span class="o">.</span><span class="n">gca</span><span class="p">()</span>
+            
+            <span class="n">Title</span> <span class="o">=</span> <span class="s">&#39;derivatives test for &#39;</span><span class="o">+</span><span class="n">name</span>
+            <span class="n">hplot</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">plotNB</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="n">Title</span><span class="p">)</span><span class="o">.</span><span class="n">gca</span><span class="p">()</span>
             <span class="n">dMdV</span> <span class="o">=</span> <span class="n">G2stMth</span><span class="o">.</span><span class="n">dervRefine</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">values</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">HistoPhases</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">parmDict</span><span class="p">,</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">varylist</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">calcControls</span><span class="p">,</span><span class="bp">self</span><span class="o">.</span><span class="n">pawleyLookup</span><span class="p">,</span><span class="bp">None</span><span class="p">)</span>
@@ -228 +230 @@
                 <span class="n">hplot</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">Mn</span><span class="p">,</span><span class="s">&#39;r&#39;</span><span class="p">,</span><span class="n">label</span><span class="o">=</span><span class="s">&#39;numeric deriv&#39;</span><span class="p">)</span>
                 <span class="n">hplot</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">dMdV</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">varylist</span><span class="o">.</span><span class="n">index</span><span class="p">(</span><span class="n">name</span><span class="p">)]</span><span class="o">-</span><span class="n">Mn</span><span class="p">,</span><span class="s">&#39;g&#39;</span><span class="p">,</span><span class="n">label</span><span class="o">=</span><span class="s">&#39;diff&#39;</span><span class="p">)</span>
-            <span class="n">hplot</span><span class="o">.</span><span class="n">legend</span><span class="p">(</span><span class="n">loc</span><span class="o">=</span><span class="s">&#39;best&#39;</span><span class="p">)</span>
+            <span class="n">hplot</span><span class="o">.</span><span class="n">legend</span><span class="p">(</span><span class="n">loc</span><span class="o">=</span><span class="s">&#39;best&#39;</span><span class="p">)</span>            
             
         <span class="k">while</span> <span class="bp">self</span><span class="o">.</span><span class="n">plotNB</span><span class="o">.</span><span class="n">nb</span><span class="o">.</span><span class="n">GetPageCount</span><span class="p">():</span>