Changeset 397 for library/doc/html/classbdm_1_1fnc.html

Timestamp:

06/24/09 21:56:30 (16 years ago)

Author:

smidl

Message:

doc

Files:

• library/doc/html/classbdm_1_1fnc.html (modified) (3 diffs)

library/doc/html/classbdm_1_1fnc.html

@@ -69 +69 @@
 </div>
 <div class="contents">
+<<<<<<< HEAD:library/doc/html/classbdm_1_1fnc.html
 <h1>bdm::fnc Class Reference</h1><!-- doxytag: class="bdm::fnc" --><!-- doxytag: inherits="bdm::root" -->Class representing function <img class="formulaInl" alt="$f(x)$" src="form_39.png"> of variable <img class="formulaInl" alt="$x$" src="form_28.png"> represented by <code>rv</code>.  
 <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="bdmbase_8h_source.html">bdmbase.h</a>&gt;</code>
+=======
+<h1>bdm::fnc Class Reference</h1><!-- doxytag: class="bdm::fnc" --><!-- doxytag: inherits="bdm::root" -->Class representing function <img class="formulaInl" alt="$f(x)$" src="form_0.png"> of variable <img class="formulaInl" alt="$x$" src="form_1.png"> represented by <code>rv</code>.  
+<a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="bdmbase_8h-source.html">bdmbase.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1fnc.html
 <p>
 
@@ -86 +93 @@
 virtual vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1fnc.html#6277b11d7fffc7ef8a2fa3e84ae5bad4">eval</a> (const vec &amp;cond)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">function evaluates numerical value of <img class="formulaInl" alt="$f(x)$" src="form_39.png"> at <img class="formulaInl" alt="$x=$" src="form_44.png"> <code>cond</code> <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">function evaluates numerical value of <img class="formulaInl" alt="$f(x)$" src="form_0.png"> at <img class="formulaInl" alt="$x=$" src="form_6.png"> <code>cond</code> <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="0786e40fade2663a70d654c1dda5d73e"></a><!-- doxytag: member="bdm::fnc::condition" ref="0786e40fade2663a70d654c1dda5d73e" args="(const vec &amp;val)" -->
 virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1fnc.html#0786e40fade2663a70d654c1dda5d73e">condition</a> (const vec &amp;val)</td></tr>
@@ -118 +125 @@
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1fnc.html
 Class representing function <img class="formulaInl" alt="$f(x)$" src="form_39.png"> of variable <img class="formulaInl" alt="$x$" src="form_28.png"> represented by <code>rv</code>. <hr>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="bdmbase_8h_source.html">bdmbase.h</a></ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:48 2009 for mixpp by&nbsp;
+=======
+Class representing function <img class="formulaInl" alt="$f(x)$" src="form_0.png"> of variable <img class="formulaInl" alt="$x$" src="form_1.png"> represented by <code>rv</code>. <hr>The documentation for this class was generated from the following file:<ul>
+<li><a class="el" href="bdmbase_8h-source.html">bdmbase.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:52 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1fnc.html
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>