Changeset 267 for bdm/stat/libBM.h

Timestamp:

02/11/09 14:15:05 (15 years ago)

Author:

smidl

Message:

samplecond modification

Files:

• bdm/stat/libBM.h (modified) (3 diffs)

bdm/stat/libBM.h

@@ -234 +234 @@
         public:
 
-                //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv \param ll is a return value of log-likelihood of the sample.
-                virtual vec samplecond ( const vec &cond, double &ll ) {
+                //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv 
+                virtual vec samplecond ( const vec &cond) {
                         this->condition ( cond );
                         vec temp= ep->sample();
-                        ll=ep->evallog ( temp );return temp;
+                        return temp;
                 };
                 //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv \param ll is a return value of log-likelihood of the sample.
@@ -298 +298 @@
 
         */
-
-        /*!
-        @brief Class for storing results (and semi-results) of an experiment
-
-        This class abstracts logging of results from implementation. This class replaces direct logging of results (e.g. to files or to global variables) by calling methods of a logger. Specializations of this abstract class for specific storage method are designed.
-        */
-        class logger : public bdmroot {
-        protected:
-                //! RVs of all logged variables.
-                Array<RV> entries;
-                //! Names of logged quantities, e.g. names of algorithm variants
-                Array<string> names;
-        public:
-                //!Default constructor
-                logger ( ) : entries ( 0 ),names ( 0 ) {}
-
-                //! returns an identifier which will be later needed for calling the log() function
-                virtual int add ( const RV &rv, string name="" ) {
-                        int id=entries.length();
-                        names=concat ( names, name ); // diff
-                        entries.set_length ( id+1,true );
-                        entries ( id ) = rv;
-                        return id; // identifier of the last entry
-                }
-
-                //! log this vector
-                virtual void logit ( int id, const vec &v ) =0;
-
-                //! Shifts storage position for another time step.
-                virtual void step() =0;
-
-                //! Finalize storing information
-                virtual void finalize() {};
-
-                //! Initialize the storage
-                virtual void init() {};
-
-                //! for future use
-                virtual ~logger() {};
-        };
-
         class datalink_e2e {
         protected:
@@ -418 +377 @@
                 //! Fill
 
+        };
+
+        /*!
+        @brief Class for storing results (and semi-results) of an experiment
+
+        This class abstracts logging of results from implementation. This class replaces direct logging of results (e.g. to files or to global variables) by calling methods of a logger. Specializations of this abstract class for specific storage method are designed.
+         */
+        class logger : public bdmroot {
+                protected:
+                //! RVs of all logged variables.
+                        Array<RV> entries;
+                //! Names of logged quantities, e.g. names of algorithm variants
+                        Array<string> names;
+                public:
+                //!Default constructor
+                        logger ( ) : entries ( 0 ),names ( 0 ) {}
+
+                //! returns an identifier which will be later needed for calling the log() function
+                        virtual int add ( const RV &rv, string name="" ) {
+                                int id=entries.length();
+                                names=concat ( names, name ); // diff
+                                entries.set_length ( id+1,true );
+                                entries ( id ) = rv;
+                                return id; // identifier of the last entry
+                        }
+
+                //! log this vector
+                        virtual void logit ( int id, const vec &v ) =0;
+
+                //! Shifts storage position for another time step.
+                        virtual void step() =0;
+
+                //! Finalize storing information
+                        virtual void finalize() {};
+
+                //! Initialize the storage
+                        virtual void init() {};
+
+                //! for future use
+                        virtual ~logger() {};
         };