Changeset 756 for applications

Timestamp:

12/28/09 17:02:37 (15 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

Location:

applications/bdmtoolbox

Files:

• mex/config2mxstruct.cpp (modified) (2 diffs)
• mex/epdf_mean.cpp (modified) (1 diff)
• mex/epdf_sample_mat.cpp (modified) (1 diff)
• mex/estimator.cpp (modified) (1 diff)
• mex/lqg_redesign.cpp (modified) (2 diffs)
• mex/merger.cpp (modified) (1 diff)
• mex/mixef_init.cpp (modified) (2 diffs)
• mex/simulator.cpp (modified) (1 diff)
• tutorial/userguide/arx_selection_example.m (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