Changeset 756

Timestamp:

12/28/09 17:02:37 (14 years ago)

Author:

mido

Message:

odladen FindMatlab?.cmake
trida UImxConfig smazana a nahrazena statickou funkci UImxArray::create_mxArray(), a podle toho upravene zdrojaky
odstranen abort ze shared pointeru

Files:

• applications/bdmtoolbox/mex/config2mxstruct.cpp (modified) (2 diffs)
• applications/bdmtoolbox/mex/epdf_mean.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/epdf_sample_mat.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/estimator.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/lqg_redesign.cpp (modified) (2 diffs)
• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/mixef_init.cpp (modified) (2 diffs)
• applications/bdmtoolbox/mex/simulator.cpp (modified) (1 diff)
• applications/bdmtoolbox/tutorial/userguide/arx_selection_example.m (modified) (1 diff)
• library/bdm/bdmroot.h (modified) (2 diffs)
• library/bdm/mex/config2mxstruct.h (deleted)
• library/bdm/mex/mex_BM.h (modified) (3 diffs)
• library/bdm/mex/mex_parser.h (modified) (3 diffs)
• library/bdm/shared_ptr.h (modified) (4 diffs)
• library/system/FindMatlab.cmake (modified) (1 diff)

applications/bdmtoolbox/mex/config2mxstruct.cpp

@@ -1 @@
-#include <mex/config2mxstruct.h>
 #include <base/user_info.h>
+#include <itpp/itmex.h>
+#include <mex/mex_parser.h>
+
+using namespace bdm;
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
@@ -6 +9 @@
                 string filename = mxArray2string ( input[0] );
                 try {
-                        UImxConfig C ( filename.c_str() );
                         if ( n_output>0 )
-                                output[0] = mxDuplicateArray ( C.mxconfig );
+                        {
+                                UIFile C ( filename.c_str() );
+                                output[0] = UImxArray::create_mxArray( C );
+                        }
                 } catch ( SettingException xcptn ) {
                         cout<<"Error in:" + string ( xcptn.getPath() ) <<endl;

applications/bdmtoolbox/mex/epdf_mean.cpp

@@ -23 +23 @@
         RV::clear_all();
         //CONFIG
-        if (!mxIsStruct(input[0])) mexErrMsgTxt("Given input is not a struct.");
-                
         UImxArray Cfg(input[0]);
         Cfg.writeFile("epdf_mean.cfg");
 
-        shared_ptr<epdf> ep=UI::build<epdf>(Cfg.getRoot());
+        shared_ptr<epdf> ep=UI::build<epdf>(Cfg);
         
         

applications/bdmtoolbox/mex/epdf_sample_mat.cpp

@@ -24 +24 @@
         RV::clear_all();
         //CONFIG
-        if (!mxIsStruct(input[0])) mexErrMsgTxt("Given input is not a struct.");
+        UImxArray Cfg(input[0]);
+        Cfg.writeFile("epdf_sample_mat.cfg");
+        shared_ptr<epdf> ep=UI::build<epdf>(Cfg);
 
         int nos=10;
-        if (n_input>1) {nos = (int)(*mxGetPr(input[1]));}
-        
-        UImxArray Cfg(input[0]);
-        Cfg.writeFile("epdf_sample_mat.cfg");
-
-        shared_ptr<epdf> ep=UI::build<epdf>(Cfg.getRoot());
+        if (n_input>1) {nos = (int)(*mxGetPr(input[1]));}       
         
         if ( n_output<1 ) mexErrMsgTxt ( "No output - nothing to do!" );

applications/bdmtoolbox/mex/estimator.cpp

@@ -209 +209 @@
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();
-                if (n_output>1) {
-                        UImxConfig UIc(mL->_setting_conf().getRoot());
-                        output[1]=UIc.mxconfig;
-                }
+                if (n_output>1) 
+                        output[1]= UImxArray::create_mxArray(mL->_setting_conf().getRoot());
         }
 #endif

applications/bdmtoolbox/mex/lqg_redesign.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
-#include <mex/config2mxstruct.h>
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
@@ -71 +70 @@
         mat2mxArray(L, output[0]);
         if (n_output>1){
-                Config C; 
-                rv.to_setting(C.getRoot());
-                UImxConfig ui(C.getRoot());
-                output[1] = ui.mxconfig;
+
+                UImxArray out;
+                UI::save( &rv, out );
+                output[1]= out.create_mxArray();
         }
                 

applications/bdmtoolbox/mex/merger.cpp

@@ -5 +5 @@
 #include <mex/mex_logger.h>
 #include <mex/mex_parser.h>
-#include <mex/config2mxstruct.h>
 #endif
 

applications/bdmtoolbox/mex/mixef_init.cpp

@@ -25 +25 @@
         //input check
         if (!mxIsNumeric(input[0])) mexErrMsgTxt("Given input #1 is not a data matrix.");
-        if (n_input<2) mexErrMsgTxt("No initial component, dont what type of mixture to fit.");
+        if (n_input<2) mexErrMsgTxt("No initial component, dont know what type of mixture to fit.");
         if (!mxIsStruct(input[1])) mexErrMsgTxt("Given input #2 is not a struct.");
         //output check
@@ -50 +50 @@
         
 #ifdef MEX      
-        mxArray* tmp= mxCreateStructMatrix(1,1,0, NULL);
-        UImxArray out(tmp);
-        mix.to_setting(out);
-        output[0]=tmp;
+        UImxArray out;
+        UI::save( &mix, out );
+        output[0]= out.create_mxArray();
 #else
         UIFile out;

applications/bdmtoolbox/mex/simulator.cpp

@@ -98 +98 @@
                 fname = argv[1];
         } else {
-                fname="estimator.cfg";
+                fname="simulator.cfg";
         }
         UIFile Cfg ( fname );

applications/bdmtoolbox/tutorial/userguide/arx_selection_example.m

@@ -1 @@
-% load data created by the MpdfDS_example
+% load data created by the pdfDS_example
 load pdfds_results
 

library/bdm/bdmroot.h

@@ -49 +49 @@
         int log_level;
 
+        //! It is necessary to allow calling of from_setting and to_setting within the user_info class
+        friend class UI;
+
+        //! Read instance properties according the data stored in the Setting structure
+        //! 
+        //! It has to be called only through user_info class, therefore it is protected 
+        virtual void from_setting ( const Setting &set ) {
+        }
+
+        //! Save all the instance properties into the Setting structure
+        //!
+        //! It has to be called only through user_info class, therefore it is protected 
+        virtual void to_setting ( Setting &set ) const {
+        }
+
 public:
         //!default constructor
@@ -76 +91 @@
         }
 
-        //! Read instance properties according the data stored in the Setting structure
-        virtual void from_setting ( const Setting &set ) {
-        }
-
-        //! Save all the instance properties into the Setting structure
-        virtual void to_setting ( Setting &set ) const {
-        }
-
         //! Check that all internal structures has been correctly set-up. Called at the end of from_setting.
         virtual void validate() {

library/bdm/mex/mex_BM.h

@@ -1 +1 @@
 #include <estim/arx.h>
 #include <itpp/itmex.h>
-#include <mex/config2mxstruct.h>
 #include "mex_parser.h"
 
@@ -25 +24 @@
         mexEpdf() {};
         void from_setting ( const Setting &S )  {
-                name = ( const char * ) S["name"];
-                UImxConfig conf ( S );
-                data = mxDuplicateArray ( conf.mxconfig );
+                UIFile conf( ( const char * ) S["name"] );
+                data = UImxArray::create_mxArray( conf );
                 //mexCallMATLAB(1, &data, 0, 0, (name+"_new").c_str());
                 //TODO (future...):
@@ -63 +61 @@
         void from_setting ( const Setting &S )  {
                 BM::from_setting ( S );
-                name = ( const char * ) S["name"];
-                UImxConfig conf ( S );
-                data = mxDuplicateArray ( conf.mxconfig );
+
+                UIFile conf( ( const char * ) S["name"] );
+                data = UImxArray::create_mxArray( conf );
+
                 //string fname = name+"_new";
                 //mexCallMATLAB(1, &data, 0, 0, (name+"_new").c_str());

library/bdm/mex/mex_parser.h

@@ -22 +22 @@
                         mexErrMsgTxt ( "Given mxArray is not a struct." );
                 };
+
                 //mexCallMATLAB(0, NULL, 1, (mxArray **) &mxarray, "dump");
                 fillGroup ( setting, mxarray );
@@ -41 +42 @@
                 fillGroup ( child, mxarray );
         }
-        //! Operator for more convenient access to this Confic
+        //! Operator for more convenient access to this Config
         operator Setting&() {
                 return getRoot();
         }
+
 private:
         void storeNumeric ( Setting &setting, const mxArray *value, string key = "" ) {
@@ -135 +137 @@
                 }
         }
+
+public:
+        //! Convert existing Setting to Matlab arrays
+        static mxArray * create_mxArray( const Setting &setting )
+        {
+                return group2mxstruct ( setting );
+        }
+
+        //! Convert existing Setting to Matlab arrays
+        mxArray * create_mxArray(  )
+        {
+                return group2mxstruct ( *this );
+        }
+
+private:
+        //! Convert libconfig's array to Matlab vector
+        static mxArray* array2mxvector ( const Setting &setting )  {
+                if ( !setting.isArray() ) mexErrMsgTxt ( "Given setting is not an array" );
+                mxArray *result = mxCreateDoubleMatrix ( 1, setting.getLength(), mxREAL );
+                double *elements = mxGetPr ( result );
+                for ( int i = 0; i < setting.getLength(); i++ ) {
+                        if ( setting.getType() == Setting::TypeInt ) { //TODO: tady je chyba -- zaporna cisla nejsou TypeInt
+                                elements[i] = ( int ) setting[i];
+                        } else {
+                                elements[i] =  setting[i];
+                        }
+                }
+                return result;
+        }
+
+        //! Convert libconfig's array to Matlab matrix
+        static mxArray* list2mxmatrix ( const Setting &setting )  {
+                if ( !setting.isList() || ( strcmp ( "matrix", setting[0] ) != 0 ) )
+                        mexErrMsgTxt ( "Given setting is not a matrix" );
+                int rows = setting[1];
+                int cols = setting[2];
+                if ( setting[3].getLength() != rows*cols )
+                        mexErrMsgTxt ( "Matrix elements do not fit to rows*cols" );
+                double *elements = new double[rows*cols];
+                for ( int i = 0; i < rows*cols; i++ ) {
+                        elements[i] = setting[3][i];
+                }
+                mat &m = * ( new mat ( elements, rows, cols ) );
+                mxArray *result = mxCreateDoubleMatrix ( rows, cols, mxREAL );
+                mat2mxArray ( m, result );
+                delete &m;
+                delete [] elements;
+                return result;
+        }
+
+        //! Convert libconfig's gourp to Matlab structure
+        static mxArray* group2mxstruct ( const Setting &setting ) {
+                if ( !setting.isGroup() ) mexErrMsgTxt ( "Given setting is not a group." );
+                const char ** keys = new const char*[setting.getLength() ];
+                for ( int i = 0; i < setting.getLength(); i++ ) {
+                        keys[i] = setting[i].getName();
+                }
+                mxArray *result = mxCreateStructMatrix ( 1, 1, setting.getLength(), keys );
+                delete keys;
+                for ( int i = 0; i < setting.getLength(); i++ ) {
+                        Setting &value = setting[i];
+                        mxArray *old = mxGetFieldByNumber ( result, 0, i );
+                        if ( old ) mxDestroyArray ( old );
+                        switch ( value.getType() ) {
+                        case Setting::TypeString:
+                                mxSetFieldByNumber ( result, 0, i, mxCreateString ( value ) );
+                                break;
+                        case Setting::TypeBoolean:
+                                mxSetFieldByNumber ( result, 0, i, mxCreateLogicalScalar ( value ) );
+                                break;
+                        case Setting::TypeGroup:
+                                mxSetFieldByNumber ( result, 0, i, group2mxstruct ( value ) );
+                                break;
+                        case Setting::TypeList:
+                                mxSetFieldByNumber ( result, 0, i, list2mxcell ( value ) );
+                                break;
+                        case Setting::TypeArray:
+                                mxSetFieldByNumber ( result, 0, i, array2mxvector ( value ) );
+                                break;
+                        case Setting::TypeInt:
+                        case Setting::TypeInt64:
+                                mxSetFieldByNumber ( result, 0, i, mxCreateDoubleScalar ( ( int ) value ) );
+                                break;
+                        case Setting::TypeFloat:
+                                mxSetFieldByNumber ( result, 0, i, mxCreateDoubleScalar ( value ) );
+                                break;
+                        default:
+                                //this should never happen
+                                mexErrMsgTxt ( "Unknown type of a setting." );
+                        }
+                }
+                return result;
+
+        }
+        //! Convert libconfig's list  to Matlab cell
+        static mxArray* list2mxcell ( const Setting &setting )  {
+                if ( !setting.isList() ) mexErrMsgTxt ( "Given setting is not a list." );
+                if ( setting.getLength() == 0 ) {
+                        mxArray *result = mxCreateCellMatrix ( 1, 0 );
+                        return result;
+                }
+
+                if ( ( setting[0].getType() == Setting::TypeString ) ) {
+                        string s = ( setting[0] );
+                        if ( s == "matrix" ) {
+                                return list2mxmatrix ( setting );
+                        }
+                }
+                mxArray *result = mxCreateCellMatrix ( 1, setting.getLength() );
+                for ( int i = 0; i < setting.getLength(); i++ ) {
+                        Setting &value = setting[i];
+                        mxArray *old = mxGetCell ( result, i );
+                        if ( old ) mxDestroyArray ( old );
+                        switch ( value.getType() ) {
+                        case Setting::TypeString:
+                                mxSetCell ( result, i, mxCreateString ( value ) );
+                                break;
+                        case Setting::TypeBoolean:
+                                mxSetCell ( result, i, mxCreateLogicalScalar ( value ) );
+                                break;
+                        case Setting::TypeGroup:
+                                mxSetCell ( result, i, group2mxstruct ( value ) );
+                                break;
+                        case Setting::TypeList:
+                                mxSetCell ( result, i, list2mxcell ( value ) );
+                                break;
+                        case Setting::TypeArray:
+                                mxSetCell ( result, i, array2mxvector ( value ) );
+                                break;
+                        case Setting::TypeInt:
+                        case Setting::TypeInt64:
+                                mxSetCell ( result, i, mxCreateDoubleScalar ( ( int ) value ) );
+                                break;
+                        case Setting::TypeFloat:
+                                mxSetCell ( result, i, mxCreateDoubleScalar ( value ) );
+                                break;
+                        default:
+                                //this should never happen
+                                mexErrMsgTxt ( "Unknown type of a setting." );
+                        }
+                }
+                return result;
+        }
 };
 

library/bdm/shared_ptr.h

@@ -123 +123 @@
         */
         T *operator->() {
-                if ( !payload ) {
-                        abort();
-                };// "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL shared pointer" );
                 return payload;
         }
@@ -133 +131 @@
         //! isn't NULL.
         T &operator*() {
-                bdm_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL shared pointer" );
                 return *payload;
         }
@@ -149 +147 @@
         //! pointer isn't NULL.
         const T *operator->() const {
-                bdm_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL shared pointer" );
                 return payload;
         }
@@ -157 +155 @@
         //! isn't NULL.
         const T &operator*() const {
-                bdm_assert_debug ( payload, "dereferencing NULL" );
+                bdm_assert_debug ( payload, "dereferencing NULL shared pointer" );
                 return *payload;
         }

library/system/FindMatlab.cmake

@@ -17 +17 @@
 IF(WIN32)
 
-  FILE(GLOB _auto_matlab_prefixes "C:/Program Files/MATLAB*/R20*" "D:/Program Files/MATLAB*/R20*" "C:/Devel/MATLAB*/R20*") # used machines Aug 2009
+  FILE(GLOB _auto_matlab_prefixes "C:/Program Files/MATLAB*" "C:/Program Files/MATLAB*/R20*" "D:/Program Files/MATLAB*/R20*" "C:/Devel/MATLAB*/R20*") # used machines Aug 2009
 
   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)