Changeset 925

Timestamp:

05/05/10 20:51:39 (14 years ago)

Author:

smidl

Message:

new mexpdf

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/epdf_mean.cpp (modified) (2 diffs)
• applications/bdmtoolbox/mex/mexBM.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/my_isobj.cpp (added)
• library/bdm/mex/mex_parser.h (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -22 +22 @@
 ## WRAPPERS
 
+
+MEX(my_isobj)
 MEX(epdf_mean)
 MEX(epdf_variance)

applications/bdmtoolbox/mex/epdf_mean.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
@@ -24 +25 @@
         //CONFIG
         UImxArray Cfg(input[0]);
-//      Cfg.writeFile("epdf_mean.cfg");
+        Cfg.writeFile("epdf_mean.cfg");
 
         shared_ptr<epdf> ep=UI::build<epdf>(Cfg);

applications/bdmtoolbox/mex/mexBM.cpp

@@ -7 +7 @@
 class mexEpdf: public epdf{
         protected:
-                string name;
                 mxArray *data;
         public:
                 mexEpdf() {};
                 void from_setting(const Setting &S)  {
-                        name = (const char *) S["name"];
-                        UImxConfig conf(S);
-                        data = mxDuplicateArray(conf.mxconfig);
-                        //mexCallMATLAB(1, &data, 0, 0, (name+"_new").c_str());
-                        //TODO (future...):
-                        //mxArray * init_data = setting2mxarray S["init_data"];
-                        //mexCallMATLAB(1, &data, 1, &init_data, name+"_from_setting");
-                        //delete init_data;
+                        data = S["object"];
                 } 
+                void validate() {
+                        mexCallMATLAB(1, &data, 0, 0, ("validate").c_str());
+                        dim = mexCallMATLAB(1, &data, 0, 0, ("dimension").c_str());
+                }
                 vec mean() const {
                         mxArray *tmp;
-                        string fname = name+"_mean";
-                        mexCallMATLAB(1, &tmp, 1, (mxArray **) &data, fname.c_str());
+                        mexCallMATLAB(1, &tmp, 1, (mxArray **) &data, "mean".c_str());
                         return mxArray2vec(tmp);
-                } 
+                }
+                
 };
 UIREGISTER(mexEpdf);

library/bdm/mex/mex_parser.h

@@ -107 +107 @@
                                 storeNumeric ( setting, value, ( string ) key );
                         }
+                        if (mxIsObject(value)){
+                                Setting &child = setting.add(key, Setting::TypeInt64);
+                                child = (long)value;
+                        }
                 }
         }