Changeset 371

Timestamp:

06/09/09 19:47:10 (15 years ago)

Author:

miro

Message:

conversion from config to matlab structure
changed expected interpretation of matrix in mexparse.h

Location:

library/mex

Files:

• config2mxstruct.cpp (added)
• config2mxstruct.h (added)
• mexBM.cpp (modified) (3 diffs)
• mexparse.h (modified) (1 diff)

library/mex/mexBM.cpp

@@ -7 +7 @@
         protected:
                 string name;
-                vec S; //bude struktura mxArray
+                mxArray *data;
         public:
-                mexEpdf(){};
-                void set(const string name0, const vec &S0){name=name0; S=S0;} // vola fci name+"new" a preda ji mxArray misto S
-                vec mean() const {return S;} //bude vysledek volani fce matlabu
+                mexEpdf() {};
+                void from_setting(const Setting &S)  {
+                        name = (const char *) S["name"];
+                        string fname = name+"_new";
+                        mexCallMATLAB(1, &data, 0, 0, fname.c_str());
+                        //TODO (future...):
+                        //mxArray * init_data = setting2mxarray S["init_data"];
+                        //mexCallMATLAB(1, &data, 1, &init_data, name+"_from_setting");
+                        //delete init_data;
+                } 
+                vec mean() const {
+                        mxArray *tmp;
+                        string fname = name+"_mean";
+                        mexCallMATLAB(1, &tmp, 1, (mxArray **) &data, fname.c_str());
+                        return mxArray2vec(tmp);
+                } 
 };
+
 class mexBM: public BM{
         protected :
                 string name;
                 mexEpdf est;
+                mxArray *data;
         public:
-                mexBM(string name0){name=name0;est.set("mexEpdf",vec_1(1.2));}
-                void bayes(const vec &dt){/* volej matlab name+"_bayes" */} 
-                const mexEpdf& posterior()const{return est;} //tohle by melo zustat!!
-                const mexEpdf* _e()const{return &est;} //tohle by melo zustat!!
+                mexBM() {}
+
+                void from_setting(const Setting &S)  {
+                        name = (const char *) S["name"];
+                        string fname = name+"_new";
+                        mexCallMATLAB(1, &data, 0, 0, (name+"_new").c_str());
+                        //the following works as long as the posterior is the
+                        //only member object there could be a structure of 
+                        //member objects in the setting and a for cycle over
+                        //all of them right here in the code
+                        Setting &posterior = S["posterior"]; 
+                        est.from_setting(posterior);
+                }
+                void bayes(const vec &dt)  {
+                //void bayes()  {
+                        string fname = name+"_bayes";
+                        mexCallMATLAB(1, &data, 1, &data, fname.c_str());
+                } 
+                const mexEpdf& posterior() const  {
+                        return est;
+                } //tohle by melo zustat!!
+                const mexEpdf* _e() const  {
+                        return &est;
+                } //tohle by melo zustat!!
 };
 
@@ -27 +62 @@
 {
     // Check the number of inputs and output arguments
-        if(n_input!=1) mexErrMsgTxt("Wrong number of input variables - expected parameter 'name'!");
+        if(n_input!=1) mexErrMsgTxt("Wrong number of input variables - expected parameter 'filename'!");
 
         // ------------------ Start of routine ---------------------------
 
-        mexBM mB(mxArray2string(input[0])); // naplni
-        mB.bayes(vec_1(1.3));
+        //mexBM mB(mxArray2string(input[0])); // naplni
+        //mB.bayes(vec_1(1.3));
+        string filename = mxArray2string(input[0]);
+        Config config;
+        config.readFile(filename.c_str());
+        mexBM mb;
+        mb.from_setting(config.getRoot());
+        vec a = "1.0 2.0 3.0";
+        mb.bayes(a);
+        
 
         // ------------------ End of routine -----------------------------
@@ -40 +83 @@
 
     // Convert the IT++ format to Matlab format for output
-        vec2mxArray(mB.posterior().mean(), output[0]);
+        //vec2mxArray(mB.posterior().mean(), output[0]);
 }

library/mex/mexparse.h

@@ -30 +30 @@
                         Setting &child = (key=="") ? setting.add(Setting::TypeList)
                                                    : setting.add(key, Setting::TypeList);
+                        Setting &label = child.add(Setting::TypeString);
+                        label = "matrix";
                         Setting &cols = child.add( Setting::TypeInt );
                         Setting &rows = child.add( Setting::TypeInt );