Changeset 374

Timestamp:

06/11/09 17:15:06 (15 years ago)

Author:

miro

Message:

mexBM works. An example added (it ignores any underlying theory).
config2mxstruct probably doesn't handle vectors and matrices, to be fixed

Location:

library/mex

Files:

• bm1.cfg (added)
• bm1_bayes.m (added)
• buildmex.sh (modified) (1 diff)
• config2mxstruct.h (modified) (6 diffs)
• mexBM.cpp (modified) (6 diffs)

library/mex/buildmex.sh

@@ -1 +1 @@
 #!/bin/sh
 
-#MATLAB_PATH=/usr/local/matlab7/
-#BDM_PATH=../../bdm
+MATLAB_PATH=/usr/local/matlab7/
+BDM_PATH=../../bdm
 
-MATLAB_PATH=/home/smidl/soft/matlab/matlab/
-BDM_PATH=/home/smidl/work/git/mixpp/bdm
+#MATLAB_PATH=/home/smidl/soft/matlab/matlab/
+#BDM_PATH=/home/smidl/work/git/mixpp/bdm
 
-#mex -g -l itpp -l bdm -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
-mex -l itpp -l bdm -Wfatal-errors -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
+mex -g -l itpp -l bdm -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
+#mex -l itpp -l bdm -I$MATLAB_PATH/extern/include -I$BDM_PATH  -L ../../bdm/ -L ../../linux/libs/ $1 
 #mxestimator.cpp
 #mex -l bdm -I ../../bdm/ -I /home/smidl/soft/matlab/matlab/extern/include -L ../../bdm/ linefit2.cpp

library/mex/config2mxstruct.h

@@ -16 +16 @@
                 mxconfig = group2mxstruct(config.getRoot());
         }
-        /*UImxConfig(const Setting &setting) {
+        UImxConfig(const Setting &setting) {
                 mxconfig = group2mxstruct(setting);
-        }*/
+        }
 
 private:
 
-        mxArray* array2mxvector(Setting &setting)  {
+        mxArray* array2mxvector(const Setting &setting)  {
                 if (!setting.isArray()) mexErrMsgTxt("Given setting is not an array");
                 double *elements = new double[setting.getLength()];
@@ -36 +36 @@
         }
 
-        mxArray* list2mxmatrix(Setting &setting)  {
+        mxArray* list2mxmatrix(const Setting &setting)  {
                 if (!setting.isList() || ("matrix" != setting[0]))
                         mexErrMsgTxt("Given setting is not a matrix");
@@ -55 +55 @@
         }
 
-        mxArray* group2mxstruct(Setting &setting) {
+        mxArray* group2mxstruct(const Setting &setting) {
                 if (!setting.isGroup()) mexErrMsgTxt("Given setting is not a group.");
                 const char ** keys = new const char*[setting.getLength()];
@@ -85 +85 @@
                         case Setting::TypeInt:
                         case Setting::TypeInt64:
+                                mxSetFieldByNumber(result, 0, i, mxCreateDoubleScalar((int) value));
+                                break;
                         case Setting::TypeFloat:
                                 mxSetFieldByNumber(result, 0, i, mxCreateDoubleScalar(value));
@@ -97 +99 @@
         }
         
-        mxArray* list2mxcell(Setting &setting)  {
+        mxArray* list2mxcell(const Setting &setting)  {
                 if (!setting.isList()) mexErrMsgTxt("Given setting is not a list.");
                 if ((setting[0].getType() == Setting::TypeString) && ("matrix" == setting[0])) {
@@ -125 +127 @@
                         case Setting::TypeInt:
                         case Setting::TypeInt64:
+                                mxSetCell(result, i, mxCreateDoubleScalar((int) value));
+                                break;
                         case Setting::TypeFloat:
                                 mxSetCell(result, i, mxCreateDoubleScalar(value));

library/mex/mexBM.cpp

@@ -1 +1 @@
 #include <itpp/itmex.h>
 #include <estim/arx.h>
+#include "config2mxstruct.h"
 
 using namespace bdm;
@@ -12 +13 @@
                 void from_setting(const Setting &S)  {
                         name = (const char *) S["name"];
-                        string fname = name+"_new";
-                        mexCallMATLAB(1, &data, 0, 0, fname.c_str());
+                        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"];
@@ -35 +37 @@
                 mexBM() {}
 
+                mxArray *get_data() {
+                        //mexCallMATLAB(0, NULL, 1, &data, "dump");
+                        return mxDuplicateArray(data);
+                }
+
                 void from_setting(const Setting &S)  {
                         name = (const char *) S["name"];
-                        string fname = name+"_new";
-                        mexCallMATLAB(1, &data, 0, 0, (name+"_new").c_str());
+                        UImxConfig conf(S);
+                        data = mxDuplicateArray(conf.mxconfig);
+                        //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 
@@ -48 +57 @@
                 void bayes(const vec &dt)  {
                 //void bayes()  {
-                        string fname = name+"_bayes";
-                        mexCallMATLAB(1, &data, 1, &data, fname.c_str());
+                        mxArray *tmp, *old;
+                        mxArray *in[2];
+                        in[0] = data;
+                        in[1] = mxCreateDoubleMatrix(dt.size(), 1, mxREAL);
+                        vec2mxArray(dt, in[1]);
+                        mexCallMATLAB(1, &tmp, 2, in, (name+"_bayes").c_str());
+                        old = data;
+                        data = mxDuplicateArray(tmp);
+                        if (old) mxDestroyArray(old);
+                        if (tmp) mxDestroyArray(tmp);
+                        //mexCallMATLAB(0, NULL, 1, &data, "dump");
                 } 
                 const mexEpdf& posterior() const  {
@@ -72 +90 @@
         config.readFile(filename.c_str());
         mexBM mb;
-        mb.from_setting(config.getRoot());
-        vec a = "1.0 2.0 3.0";
-        mb.bayes(a);
+        Setting &root = config.getRoot();
+        mb.from_setting(root);
+        vec dt = "18.0";
+        mb.bayes(dt);
+        if(n_output>0) output[0] = mb.get_data();
         
 
@@ -80 +100 @@
 
     // Create output vectors
-        output[0] = mxCreateDoubleMatrix(1,1, mxREAL);
+        //output[0] = mxCreateDoubleMatrix(1,1, mxREAL);
 
     // Convert the IT++ format to Matlab format for output