Changeset 711

Timestamp:

11/08/09 22:07:31 (14 years ago)

Author:

mido

Message:

definitivne odstraneno epdf2mpdf a mepdf, rozpravano zacleneni testu mmixu pod pdf_harness

Location:

library

Files:

• bdm/stat/emix.h (modified) (1 diff)
• doc/tutorial/00install.dox (modified) (2 diffs)
• doc/tutorial/01userguide.dox (modified) (2 diffs)
• doc/tutorial/memory_management.dox (modified) (1 diff)
• tests/mmix.cfg (added)

library/bdm/stat/emix.h

@@ -496 +496 @@
         vec samplecond (const vec &cond);
 
+        //! Load from structure with elements:
+        //!  \code
+        //! { class='mmix';
+        //!   pdfs = (..., ...);     // list of pdfs in the mixture
+        //!   weights = ( 0.5, 0.5 ); // weights of pdfs in the mixture
+        //! }
+        //! \endcode
+        //!@}
+        void from_setting ( const Setting &set ) {
+                UI::get ( Coms, set, "pdfs", UI::compulsory );
+
+                if( !UI::get( w, set, "weights", UI::optional ) )
+                {
+                        int len = Coms.length();
+                        w.set_length( len );
+                        double default_weight = 1.0 / len;
+                        for( int i=0; i < len; i++)
+                                w(i) = default_weight;
+                }
+        }
 };
+UIREGISTER ( mmix );
 
 }

library/doc/tutorial/00install.dox

@@ -47 +47 @@
 \section win Windows
 
-The following approach was tested on Visual Studio 9, so we recommend to download and install it. 
-http://www.microsoft.com/express/vc/
+The following approach was tested on the Microsoft Visual Studio 9. 
 
 Make sure you have cmake installed.
@@ -77 +76 @@
   directory
 
+For more comfortable work with Subversion, we recommend to install also the Visual SVN - 
+a Visual Studio plug-in that integrates Subversion and TortoiseSVN, see http://www.visualsvn.com/
+
+
 \section mac Mac OS X
 

library/doc/tutorial/01userguide.dox

@@ -245 +245 @@
 DS.class = 'pdfDS';
 DS.pdf.class  = 'mprod';
-DS.pdf.pdfs  = {fy, epdf2mpdf(fu)};
+DS.pdf.pdfs  = {fy, fu};
 \endcode
 
@@ -253 +253 @@
  - the same concept is used for enorm, where enorm<chmat> and enorm<fsqmat> are also possible. In this particular use, these objects are equivalent. In specific situation, e.g. Kalman filter implemented on Choleski decomposition (bdm::KalmanCh), only enorm<chmat> is approprate.
  - class 'mprod' represents the chain rule of probability. Attribute \c pdfs of its configuration structure is a list of conditional densities. Conditional density \f$ f(a|b)\f$ is represented by class \c pdf and its offsprings. Class \c RV is used to describe both variables before conditioning (field \c rv ) and after conditioning sign (field \c rvc).
- - due to simplicity of implementation, mprod accept only conditional densities in the field \c pdfs. Hence, the pdf \f$ f(u_t)\f$ must be converted to conditional density with empty conditioning, \f$ f(u_t| \{\})\f$. This is achieved by calling function epdf2mpdf which is only a trivial wrapper creating class bdm::mepdf.
  
  

library/doc/tutorial/memory_management.dox

@@ -107 +107 @@
 
 \code
-class mepdf : public mpdf
-{
-        shared_ptr<epdf> iepdf;
+class mratio: public pdf {
+protected:
+        shared_ptr<epdf> den;
 public:
-        mepdf (shared_ptr<epdf> em) {
-                iepdf = em;
+        mratio ( const epdf* nom0, const RV &rv, bool copy = false ) {
+                // build denominator
+                den = nom0->marginal ( rvc );
 \endcode