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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/classbdm_1_1compositepdf.html

@@ -72 +72 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1compositepdf.html
 <code>#include &lt;<a class="el" href="bdmbase_8h_source.html">bdmbase.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="bdmbase_8h-source.html">bdmbase.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1compositepdf.html
 <p>
 
@@ -104 +108 @@
 Chain rule of pdfs - abstract part common for <a class="el" href="classbdm_1_1mprod.html" title="Chain rule decomposition of epdf.">mprod</a> and merger. this abstract class is common to <a class="el" href="classbdm_1_1epdf.html" title="Probability density function with numerical statistics, e.g. posterior density.">epdf</a> and <a class="el" href="classbdm_1_1mpdf.html" title="Conditional probability density, e.g. modeling some dependencies.">mpdf</a>. 
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1compositepdf.html
 <dl class="todo" compact><dt><b><a class="el" href="todo.html#_todo000001">Todo:</a></b></dt><dd>Think of better design - global functions rv=get_rv(Array&lt;mpdf*&gt; mpdfs); ?? </dd></dl>
+=======
+<dl compact><dt><b><a class="el" href="todo.html#_todo000001">Todo:</a></b></dt><dd>Think of better design - global functions rv=get_rv(Array&lt;mpdf*&gt; mpdfs); ?? </dd></dl>
+>>>>>>> doc:library/doc/html/classbdm_1_1compositepdf.html
 <hr><h2>Member Function Documentation</h2>
 <a class="anchor" name="c73d39acc4378eee6a63155c3517d3c9"></a><!-- doxytag: member="bdm::compositepdf::getrv" ref="c73d39acc4378eee6a63155c3517d3c9" args="(bool checkoverlap=false)" -->
@@ -131 +139 @@
 </dl>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1compositepdf.html
 <p>References <a class="el" href="bdmbase_8cpp_source.html#l00078">bdm::RV::add()</a>, and <a class="el" href="bdmbase_8h_source.html#l00639">mpdfs</a>.</p>
 
 <p>Referenced by <a class="el" href="merger_8h_source.html#l00081">bdm::merger_base::set_sources()</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8cpp-source.html#l00078">bdm::RV::add()</a>, and <a class="el" href="bdmbase_8h-source.html#l00639">mpdfs</a>.</p>
+
+<p>Referenced by <a class="el" href="merger_8h-source.html#l00081">bdm::merger_base::set_sources()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1compositepdf.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1compositepdf.html
 <li><a class="el" href="bdmbase_8h_source.html">bdmbase.h</a><li>bdmbase.cpp</ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:48 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="bdmbase_8h-source.html">bdmbase.h</a><li>bdmbase.cpp</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_1compositepdf.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>