Changeset 347

Timestamp:

05/27/09 21:37:49 (16 years ago)

Author:

smidl

Message:

change in loggers! old experiments may stop working

Files:

• bdm/stat/libBM.h (modified) (2 diffs)
• bdm/stat/loggers.cpp (modified) (1 diff)
• bdm/stat/loggers.h (modified) (3 diffs)
• bdm/stat/loggers_ui.h (modified) (1 diff)
• library/mex/mexlog.h (modified) (1 diff)

bdm/stat/libBM.h

@@ -522 +522 @@
         //! returns an identifier which will be later needed for calling the \c logit() function
         //! For empty RV it returns -1, this entry will be ignored by \c logit().
-        virtual int add ( const RV &rv, string name="" ) {
+        virtual int add ( const RV &rv, string prefix="" ) {
                 int id;
                 if ( rv._dsize() >0 ) {
                         id=entries.length();
-                        names=concat ( names, name ); // diff
+                        names=concat ( names, prefix); // diff
                         entries.set_length ( id+1,true );
                         entries ( id ) = rv;
@@ -746 +746 @@
 
                 // Add mean value
-                if (LFlags(0)) LIDs ( 0 ) =L.add ( r,name );
-                if (LFlags(1)) LIDs ( 1 ) =L.add ( r,name+"_lb" );
-                if (LFlags(2)) LIDs ( 2 ) =L.add ( r,name+"_ub" );
-                if (LFlags(3)) LIDs ( 3 ) =L.add ( RV("ll",1,0),r.name(0)+name ); //TODO: "local" RV 
+                if (LFlags(0)) LIDs ( 0 ) =L.add ( r,name+"mean_" );
+                if (LFlags(1)) LIDs ( 1 ) =L.add ( r,name+"lb_" );
+                if (LFlags(2)) LIDs ( 2 ) =L.add ( r,name+"ub_" );
+                if (LFlags(3)) LIDs ( 3 ) =L.add ( RV("ll",1),name ); //TODO: "local" RV 
         }
         virtual void logit ( logger &L ) {

bdm/stat/loggers.cpp

@@ -12 +12 @@
         it_file itf ( fname );
         int i;
+        string vec_name="";
+        int istart, iend;
         for ( i=0; i<entries.length();i++ ) {
-                if ( names ( i ).length() <1 ) {
-                        std::ostringstream o;
-                        o<<"Variable"<<i;
-                        itf << Name ( o.str() ) << vectors ( i );
+                istart=0;
+                for (int j=0; j<entries(i).length(); j++){ // same for as in add!!!
+                        vec_name = names(i) + entries(i).name(j);
+                        iend=istart+entries(i).size(j)-1;
+                        itf << Name ( vec_name ) << vectors ( i ).get_cols(istart,iend);
+                        // move start after current end...
+                        istart=iend+1;
                 }
-                else {
-                        itf << Name ( names ( i ) ) << vectors ( i );
-                }
+                
         }
 }

bdm/stat/loggers.h

@@ -34 +34 @@
         //! Storage
         Array<mat> vectors;
-        //!
+        //! name of it file to save results
+        string itfilename;
 public:
         //!Default constructor
-        memlog ( int maxlen0 ) : logger(),maxlen ( maxlen0 ),ind ( 0 ),vectors ( 0 ) {}
+        memlog ( int maxlen0, string itf="" ) : logger(),maxlen ( maxlen0 ),ind ( 0 ),vectors ( 0 ),itfilename(itf) {}
         //! Initialize storage
         void init() {
@@ -43 +44 @@
                 vectors.set_size ( n ); 
                 for ( i=0;i<n;i++ ) {vectors(i).set_size (maxlen,entries(i)._dsize() );}
-                ;
         }
         void step() {if ( ind<maxlen ) ind++; else it_error ( "memlog::ind is too high;" );}
@@ -57 +57 @@
         //! Save values into an itfile named after \c fname.
         void itsave(const char* fname);
+        //! 
+        void finalize() {if (itfilename.length()>0) itsave(itfilename.c_str());};
+
 };
 

bdm/stat/loggers_ui.h

@@ -75 +75 @@
 
 UIREGISTER(UIdirfilelog);
+
+
+/*! \brief UI for memlog 
+\code
+logger = {
+        type = "itpplog";
+        filename = "file_name.it"; // resulting filename with results in it format
+        maxlen = 100;          // size of memory buffer
+}
+\endcode
+ */
+class UIitpplog : public UIbuilder {
+        public:
+                UIitpplog():UIbuilder("itpplog"){};
+                bdmroot* build(Setting &S) const{
+                        return new memlog(S["maxlen"],S["filename"]);
+                };
+};
+
+UIREGISTER(UIitpplog);
 #endif // LGR_H

library/mex/mexlog.h

@@ -22 +22 @@
         public:
         //! constructor
-        mexlog(int maxlen): memlog(maxlen){};
+        mexlog(int maxlen): memlog(maxlen,"mx"){};
         //!
         mxArray* toCell(){
                 mxArray* tmp = mxCreateStructMatrix(1,1,0,NULL);
 
-                //copy vectors to mxStruct
-                for (int i=0; i<names.length();i++){
-                        mat& M=vectors(i);
-                        mxArray* fld=mxCreateDoubleMatrix(M.rows(), M.cols(), mxREAL);
-                        mat2mxArray(M,fld);
-                        mxReplaceFieldNM(tmp, names(i).c_str(), fld);
+                //copied from itsave
+                int i;
+                string vec_name="";
+                int istart, iend;
+                
+                mat M; //temporary matrix
+                for ( i=0; i<entries.length();i++ ) {
+                        istart=0;
+                        for (int j=0; j<entries(i).length(); j++){ // same for as in add!!!
+                                vec_name = names(i) + entries(i).name(j);
+                                iend=istart+entries(i).size(j)-1;
+                                M=vectors(i).get_cols(istart,iend);
+                                istart=iend+1;
+                                // copy the selection to mx
+                                mxArray* fld=mxCreateDoubleMatrix(M.rows(), M.cols(), mxREAL);
+                                mat2mxArray(M,fld);
+                                mxReplaceFieldNM(tmp, vec_name.c_str(), fld);
+                        }
                 }
                 return tmp;