Changeset 1086

Timestamp:

06/11/10 14:39:57 (14 years ago)

Author:

smidl

Message:

doc

Files:

• applications/bdmtoolbox/doc/local/000scenarios.dox (modified) (2 diffs)
• applications/bdmtoolbox/doc/local/002mex_classes.dox (modified) (1 diff)
• applications/bdmtoolbox/doc/local/mainpage.dox (modified) (1 diff)
• library/bdm/stat/merger.h (modified) (2 diffs)

applications/bdmtoolbox/doc/local/000scenarios.dox

@@ -38 +38 @@
  - List of <a href="bdm_doc/annotated_bdm_BM.html" > Bayesian Models</a>
  - List of <a href="bdm_doc/annotated_bdm_Controllers.html" > Controllers</a>
+ - List of <a href="bdm_doc/annotated_bdm_MergerBase.html" > Mergers</a>
 
 For details of their use, see tutorials:
@@ -43 +44 @@
  - \ref userguide_sim
  - \ref userguide_estim
+ - \ref userguide_merg
  - \ref userguide_ctrl
  

applications/bdmtoolbox/doc/local/002mex_classes.dox

@@ -1 +1 @@
 /*!
-\page mex_bdm  Use Case #3: combining Matlab classes and BDM classes
+\page bdt_mex_bdm  Use Case #3: combining Matlab classes and BDM classes
 
 The classes written in Matlab can be combined with standard BDM classes via corresponding C++ classes with equal names, i.e. mexBM.m is accepted by C++ class mexBM

applications/bdmtoolbox/doc/local/mainpage.dox

@@ -48 +48 @@
 The purpose of this use case is to allow seamless integration of pure Matlab algorithm into the routines of BDM. 
 
-See \ref bdt_mex_classes for details
+See \ref bdt_mex_bdm for details
 
  */

library/bdm/stat/merger.h

@@ -260 +260 @@
 
     \code
-    class = 'merger_base';
+    class = 'MergerDiscrete';
     method = 'arithmetic' or 'geometric' or 'lognormal';   % name of the model used for merging 
     --- compulsory only for lognormal merging model ---
@@ -267 +267 @@
     dbg_file = '...';                                      % name of the file to store debug informations
     --- inherited fields ---
-    bdm::epdf::from_setting
+    bdm::MergerBase::from_setting
     \endcode
     */