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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

• library/doc/html/classbdm_1_1BMEF.html (modified) (4 diffs)

library/doc/html/classbdm_1_1BMEF.html

@@ -72 +72 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1BMEF.html
 <code>#include &lt;<a class="el" href="exp__family_8h_source.html">exp_family.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="exp__family_8h-source.html">exp_family.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1BMEF.html
 <p>
 
@@ -136 +140 @@
 virtual <a class="el" href="classbdm_1_1epdf.html">epdf</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1BM.html#688d7a2aced1e06aa1c468d73a9e5eba">epredictor</a> () const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Constructs a predictive density <img class="formulaInl" alt="$ f(d_{t+1} |d_{t}, \ldots d_{0}) $" src="form_52.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Constructs a predictive density <img class="formulaInl" alt="$ f(d_{t+1} |d_{t}, \ldots d_{0}) $" src="form_14.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="598b25e3f3d96a5bc00a5faeb5b3c912"></a><!-- doxytag: member="bdm::BMEF::predictor" ref="598b25e3f3d96a5bc00a5faeb5b3c912" args="() const " -->
 virtual <a class="el" href="classbdm_1_1mpdf.html">mpdf</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1BM.html#598b25e3f3d96a5bc00a5faeb5b3c912">predictor</a> () const </td></tr>
@@ -250 +254 @@
 <p>Reimplemented in <a class="el" href="classbdm_1_1ARX.html#8bdf2974052e8ce74eb0d4f3791c58a3">bdm::ARX</a>, <a class="el" href="classbdm_1_1MixEF.html#5bd7da667da183eed1577f11dff0c1f1">bdm::MixEF</a>, and <a class="el" href="classbdm_1_1multiBM.html#1e4bf41b61937fd80f34049742e23f95">bdm::multiBM</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1BMEF.html
 <p>References <a class="el" href="exp__family_8h_source.html#l00096">bayes()</a>.</p>
+=======
+<p>References <a class="el" href="exp__family_8h-source.html#l00096">bayes()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1BMEF.html
 
 </div>
@@ -274 +282 @@
 <p>Reimplemented in <a class="el" href="classbdm_1_1ARX.html#080a7e531e3aa06694112863b15bc6a4">bdm::ARX</a>, <a class="el" href="classbdm_1_1MixEF.html#da724da464a75e07521941e430929efa">bdm::MixEF</a>, and <a class="el" href="classbdm_1_1multiBM.html#e157b607c1e3fa91d42aeea44458e2bf">bdm::multiBM</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1BMEF.html
 <p>Referenced by <a class="el" href="bdmbase_8h_source.html#l00768">bdm::BM::logpred_m()</a>.</p>
+=======
+<p>Referenced by <a class="el" href="bdmbase_8h-source.html#l00768">bdm::BM::logpred_m()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1BMEF.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1BMEF.html
 <li><a class="el" href="exp__family_8h_source.html">exp_family.h</a><li>exp_family.cpp</ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:53 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="exp__family_8h-source.html">exp_family.h</a><li>exp_family.cpp</ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:54 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1BMEF.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>