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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/classbdm_1_1linfn.html

@@ -69 +69 @@
 </div>
 <div class="contents">
-<h1>bdm::linfn Class Reference</h1><!-- doxytag: class="bdm::linfn" --><!-- doxytag: inherits="bdm::fnc" -->Class representing function <img class="formulaInl" alt="$f(x) = Ax+B$" src="form_88.png">.  
+<h1>bdm::linfn Class Reference</h1><!-- doxytag: class="bdm::linfn" --><!-- doxytag: inherits="bdm::fnc" -->Class representing function <img class="formulaInl" alt="$f(x) = Ax+B$" src="form_41.png">.  
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1linfn.html
 <code>#include &lt;<a class="el" href="functions_8h_source.html">functions.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="functions_8h-source.html">functions.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1linfn.html
 <p>
 
@@ -82 +86 @@
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1linfn.html#b8063094a2aa210dcf7ae73e2b85e09c">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="b39c494c12863c031eb2acf86c0bc429"></a><!-- doxytag: member="bdm::linfn::linfn" ref="b39c494c12863c031eb2acf86c0bc429" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1linfn.html#b39c494c12863c031eb2acf86c0bc429">linfn</a> ()</td></tr>
@@ -122 +126 @@
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1linfn.html
 Class representing function <img class="formulaInl" alt="$f(x) = Ax+B$" src="form_88.png">. <hr>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="functions_8h_source.html">functions.h</a></ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:51 2009 for mixpp by&nbsp;
+=======
+Class representing function <img class="formulaInl" alt="$f(x) = Ax+B$" src="form_41.png">. <hr>The documentation for this class was generated from the following file:<ul>
+<li><a class="el" href="functions_8h-source.html">functions.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:53 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1linfn.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>