Changeset 685 for library/bdm/mex/mex_datasource.h

Timestamp:

10/29/09 23:23:56 (15 years ago)

Author:

smidl

Message:

mex tutorial cleanup + working mexDS

Files:

• library/bdm/mex/mex_datasource.h (modified) (2 diffs)

library/bdm/mex/mex_datasource.h

@@ -91 +91 @@
         \code
         system={
-                type="mexDS";
+                class="mexDS";
                 step_name="";              // name of function to call
                 input_name="";             // name of workspace variable where inputs are written
-                rv_out = {class='RV',...}  // identification of outputs
-                rv_in = {class='RV',...}   // identification of inputs
+                yrv = {class='RV',...}  // identification of outputs
+                urv = {class='RV',...}   // identification of inputs
                 };
         \endcode
@@ -106 +106 @@
                 UI::get(input_name, set, "input_name", UI::compulsory);
                 
-                shared_ptr<RV> ry = UI::build<RV> ( set, "rv_out", UI::compulsory );
-                shared_ptr<RV> ru = UI::build<RV> ( set, "rv_in", UI::compulsory);
+                shared_ptr<RV> ry = UI::build<RV> ( set, "yrv", UI::compulsory );
+                shared_ptr<RV> ru = UI::build<RV> ( set, "urv", UI::compulsory);
 
-                dtsize=ry->_dsize();
+                ytsize=ry->_dsize();
                 utsize=ru->_dsize();
-
+                dtsize = ytsize+utsize;
+                
                 set_drv(*ry, *ru);
+                validate();
         }
         
         void step() {
                 mxArray* tmp;
-                mxArray* tmp2;
+                mxArray* dummy=NULL;
                 // write inputs to variable input_name
                 mxArray* mxinp= mexGetVariable ( "global", input_name.c_str()) ;
+                if (mxinp){
+                        if((int)mxGetM(mxinp)!=utsize || (int)mxGetN(mxinp)!=utsize) {
+                                // mxinp is invalid - create new one
+                                mxDestroyArray(mxinp);
+                                mxinp=mxCreateDoubleMatrix(utsize,1,mxREAL);
+                        }
+                        
+                } else {
+                        mxinp=mxCreateDoubleMatrix(utsize,1,mxREAL);
+                }
                 vec2mxArray(ut, mxinp);
+                mexPutVariable("global",input_name.c_str(),mxinp);
                 // call function step_name
-                mexCallMATLAB(1, &tmp, 0, (mxArray **) &tmp2, step_name.c_str());
+                mexCallMATLAB(1, &tmp, 0, (mxArray **) &dummy, step_name.c_str());
                 // save its results
-                dt=mxArray2vec(tmp);
+                bdm_assert_debug((int)mxGetM(tmp)==ytsize || (int)mxGetN(tmp)==ytsize,"mexDS.step() expected return vector of length " + num2str(dtsize) +
+                "got vector " + num2str((int)mxGetM(tmp)) + "x" + num2str((int)mxGetN(tmp)));
+                //write  y
+                dt.set_subvector(0,mxArray2vec(tmp));
+                //write u
+                dt.set_subvector(ytsize,ut);
         }
-        void write(const vec &ut0){ ut=ut0;}
-        void getdata(vec &dt_out) const {dt_out = dt;   }
+        void write(const vec &ut0){ 
+                bdm_assert_debug(ut0.length()==ut.length(),"mexDS: Incompatible input vector");
+                ut=ut0;
+        }
+        void getdata(vec &dt_out) const {
+                bdm_assert_debug(dt_out.length()==dt.length(),"mexDS: Incompatible output vector");
+                dt_out = dt;    
+        }
 
+        void validate() {
+                dt=zeros(dtsize);
+                ut=zeros(utsize);
+        }
 
         // TODO dodelat void to_setting( Setting &set ) const;