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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/classbdm_1_1ArxDS.html

@@ -72 +72 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1ArxDS.html
 <code>#include &lt;<a class="el" href="datasources_8h_source.html">datasources.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="datasources_8h-source.html">datasources.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1ArxDS.html
 <p>
 
@@ -98 +102 @@
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1ArxDS.html#57dfa26b23cc03d53b123fa7e0474b19">step</a> ()</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Moves from <img class="formulaInl" alt="$ t $" src="form_50.png"> to <img class="formulaInl" alt="$ t+1 $" src="form_51.png">, i.e. perfroms the actions and reads response of the system. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Moves from <img class="formulaInl" alt="$ t $" src="form_12.png"> to <img class="formulaInl" alt="$ t+1 $" src="form_13.png">, i.e. perfroms the actions and reads response of the system. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="7c8b418677a48041adacac8e8e9c9849"></a><!-- doxytag: member="bdm::ArxDS::ArxDS" ref="7c8b418677a48041adacac8e8e9c9849" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1ArxDS.html#7c8b418677a48041adacac8e8e9c9849">ArxDS</a> ()</td></tr>
@@ -157 +161 @@
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1ArxDS.html#a11a3f3fbeea1d17b66b073017964597">H</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">History, ordered as <img class="formulaInl" alt="$[y_t, u_t, y_{t-1 }, u_{t-1}, \ldots]$" src="form_55.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">History, ordered as <img class="formulaInl" alt="$[y_t, u_t, y_{t-1 }, u_{t-1}, \ldots]$" src="form_17.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="392b87be85675cb3d55fa4953d671bb5"></a><!-- doxytag: member="bdm::ArxDS::U" ref="392b87be85675cb3d55fa4953d671bb5" args="" -->
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1ArxDS.html#392b87be85675cb3d55fa4953d671bb5">U</a></td></tr>
@@ -257 +261 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1root.html#0551e3121091c5199bf4413b50522176">bdm::root</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1ArxDS.html
 <p>References <a class="el" href="user__info_8h_source.html#l00358">bdm::UI::get()</a>, <a class="el" href="datasources_8h_source.html#l00168">set_drv()</a>, <a class="el" href="datasources_8h_source.html#l00188">set_options()</a>, and <a class="el" href="datasources_8h_source.html#l00165">set_parameters()</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8h-source.html#l00123">bdm::RV::_dsize()</a>, <a class="el" href="datasources_8h-source.html#l00168">set_drv()</a>, <a class="el" href="datasources_8h-source.html#l00188">set_options()</a>, and <a class="el" href="datasources_8h-source.html#l00165">set_parameters()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1ArxDS.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1ArxDS.html
 <li><a class="el" href="datasources_8h_source.html">datasources.h</a><li>datasources.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="datasources_8h-source.html">datasources.h</a><li>datasources.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_1ArxDS.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>