Show
Ignore:
Timestamp:
06/24/09 21:57:21 (16 years ago)
Author:
smidl
Message:

doc 2

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • library/doc/html/classbdm_1_1merger__base.html

    r397 r398  
    55<link href="doxygen.css" rel="stylesheet" type="text/css"> 
    66</head><body> 
    7 <!-- Generated by Doxygen 1.5.9 --> 
     7<!-- Generated by Doxygen 1.5.8 --> 
    88<script type="text/javascript"> 
    99<!-- 
    … …  
    7272<a href="#_details">More...</a> 
    7373<p> 
    74 <code>#include &lt;<a class="el" href="merger_8h_source.html">merger.h</a>&gt;</code> 
     74<code>#include &lt;<a class="el" href="merger_8h-source.html">merger.h</a>&gt;</code> 
    7575<p> 
    7676 
    … …  
    243243Array&lt; <a class="el" href="classbdm_1_1datalink__m2e.html">datalink_m2e</a> * &gt;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1merger__base.html#8098858f2edb1294122cbe4f05bf8694">zdls</a></td></tr> 
    244244 
    245 <<<<<<< HEAD:library/doc/html/classbdm_1_1merger__base.html 
    246 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Data Links for extension <img class="formulaInl" alt="$ f(z_i|x_i,y_i) $" src="form_129.png">. <br></td></tr> 
    247 ======= 
    248245<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Data Links for extension <img class="formulaInl" alt="$ f(z_i|x_i,y_i) $" src="form_102.png">. <br></td></tr> 
    249 >>>>>>> doc:library/doc/html/classbdm_1_1merger__base.html 
    250246<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="39d263d92aa85553730c44958a92a541"></a><!-- doxytag: member="bdm::merger_base::Npoints" ref="39d263d92aa85553730c44958a92a541" args="" --> 
    251247int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1merger__base.html#39d263d92aa85553730c44958a92a541">Npoints</a></td></tr> 
    … …  
    330326</dl> 
    331327 
    332 <<<<<<< HEAD:library/doc/html/classbdm_1_1merger__base.html 
    333 <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">bdm::compositepdf::mpdfs</a>.</p> 
    334  
    335 <p>Referenced by <a class="el" href="merger_8h_source.html#l00081">set_sources()</a>.</p> 
    336 ======= 
    337328<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">bdm::compositepdf::mpdfs</a>.</p> 
    338329 
    339330<p>Referenced by <a class="el" href="merger_8h-source.html#l00081">set_sources()</a>.</p> 
    340 >>>>>>> doc:library/doc/html/classbdm_1_1merger__base.html 
    341331 
    342332</div> 
    … …  
    363353<p>Reimplemented from <a class="el" href="classbdm_1_1epdf.html#0c8d13d788094605b3cdab20a6e22b75">bdm::epdf</a>.</p> 
    364354 
    365 <<<<<<< HEAD:library/doc/html/classbdm_1_1merger__base.html 
    366 <p>References <a class="el" href="exp__family_8h_source.html#l01108">bdm::eEmp::_samples()</a>, <a class="el" href="exp__family_8h_source.html#l01104">bdm::eEmp::_w()</a>, <a class="el" href="bdmbase_8h_source.html#l00237">bdm::epdf::dim</a>, <a class="el" href="merger_8h_source.html#l00065">eSmp</a>, and <a class="el" href="merger_8h_source.html#l00055">Npoints</a>.</p> 
    367  
    368 <p>Referenced by <a class="el" href="merger_8h_source.html#l00247">variance()</a>.</p> 
    369 ======= 
    370355<p>References <a class="el" href="exp__family_8h-source.html#l01108">bdm::eEmp::_samples()</a>, <a class="el" href="exp__family_8h-source.html#l01104">bdm::eEmp::_w()</a>, <a class="el" href="bdmbase_8h-source.html#l00237">bdm::epdf::dim</a>, <a class="el" href="merger_8h-source.html#l00065">eSmp</a>, and <a class="el" href="merger_8h-source.html#l00055">Npoints</a>.</p> 
    371356 
    372357<p>Referenced by <a class="el" href="merger_8h-source.html#l00247">variance()</a>.</p> 
    373 >>>>>>> doc:library/doc/html/classbdm_1_1merger__base.html 
    374358 
    375359</div> 
    376360</div><p> 
    377361<hr>The documentation for this class was generated from the following files:<ul> 
    378 <li><a class="el" href="merger_8h_source.html">merger.h</a><li>merger.cpp</ul> 
    379 </div> 
    380 <<<<<<< HEAD:library/doc/html/classbdm_1_1merger__base.html 
    381 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:58 2009 for mixpp by&nbsp; 
    382 ======= 
    383 <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:54 2009 for mixpp by&nbsp; 
    384 >>>>>>> doc:library/doc/html/classbdm_1_1merger__base.html 
     362<li><a class="el" href="merger_8h-source.html">merger.h</a><li>merger.cpp</ul> 
     363</div> 
     364<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:06 2009 for mixpp by&nbsp; 
    385365<a href="http://www.doxygen.org/index.html"> 
    386 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address> 
     366<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address> 
    387367</body> 
    388368</html>