Changeset 596

Timestamp:

09/01/09 00:55:05 (16 years ago)

Author:

smidl

Message:

#37 almost finished

Files:

• applications/bdmtoolbox/tutorial/estimation/mexDS_test_step.m (added)
• applications/bdmtoolbox/tutorial/estimation/mexds_test.m (modified) (1 diff)
• applications/bdmtoolbox/tutorial/estimation/mexds_test2.m (added)
• library/bdm/base/bdmbase.h (modified) (2 diffs)
• library/bdm/mex/mex_datasource.h (modified) (1 diff)

applications/bdmtoolbox/tutorial/estimation/mexds_test.m

@@ -1 @@
-y = struct('class','RV','names',{{'y'}}); 
+% function x=xxx()
+out = struct('class','RV','names',{{'y'}}); 
+in = struct('class','RV','names',{{'u'}}); 
 
 mxD = rand(1,10);
-
 %Data generating system
-system_ = struct(...
+mxADS = struct(...
         'class', 'mxArrayDS',...
         'varname','mxD');
-
-estimators = {};
-
 %experiment description
 experiment.ndat = 9;
 
-M=estimator(system_,estimators,experiment);%,logger);
+M=estimator(mxADS,{},experiment);%,logger);
+
+% out = mexDS_test_input + mexDS_test_input;

library/bdm/base/bdmbase.h

@@ -789 +789 @@
                 //! Register DS for logging into logger L
                 virtual void log_add (logger &L) {
-                        bdm_assert_debug (dtsize == Drv._dsize(), "invalid DS: dtsize different from Drv");
-                        bdm_assert_debug (utsize == Urv._dsize(), "invalid DS: utsize different from Urv");
+                        bdm_assert_debug (dtsize == Drv._dsize(), "invalid DS: dtsize ("+ num2str(dtsize)+ ") different from Drv "+ num2str(Drv._dsize()));
+                        bdm_assert_debug (utsize == Urv._dsize(), "invalid DS: utsize ("+ num2str(utsize)+ ") different from Urv "+ num2str(Urv._dsize()));
 
                         L_dt = L.add (Drv, "");
@@ -806 +806 @@
                 //!access function
                 virtual RV _drv() const {
-                        return concat (Drv, Urv);
+        //              return concat (Drv, Urv);// why!!!
+                        return Drv;// why!!!
                 }
                 //!access function

library/bdm/mex/mex_datasource.h

@@ -65 +65 @@
 SHAREDPTR ( mxArrayDS );
 
+/*!
+* \brief Matlab wrapper for DS mapping functions step() to a matlab function
+
+The identifier of matlab function is stored in attribute \c name.
+This identifier defines: 
+\li function to call to do a step(): name_step.m
+\li workspace variable to write input to: name_input
+*/
+class mexDS : public DS {
+        protected:
+                //! identifier of matlab function 
+                string step_name;
+                //! identifier of matlab input variabel
+                string input_name;
+                //! cache of results from name_step
+                vec dt;
+                //! cache of inputs 
+                vec ut;
+        public:
+        //!Default constructor
+        mexDS ():DS() {};
+
+        /*! \brief Create memory data source from mxArray
+
+        \code
+        system={
+                type="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
+                };
+        \endcode
+
+        MemDS with the above fields will be created;
+
+        */
+        void from_setting ( const Setting &set ) {
+                UI::get(step_name, set, "step_name", UI::compulsory);
+                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);
+
+                dtsize=ry->_dsize();
+                utsize=ru->_dsize();
+
+                set_drv(*ry, *ru);
+        }
+        
+        void step() {
+                mxArray* tmp;
+                mxArray* tmp2;
+                // write inputs to variable input_name
+                mxArray* mxinp= mexGetVariable ( "global", input_name.c_str()) ;
+                vec2mxArray(ut, mxinp);
+                // call function step_name
+                mexCallMATLAB(1, &tmp, 0, (mxArray **) &tmp2, step_name.c_str());
+                // save its results
+                dt=mxArray2vec(tmp);
+        }
+        void write(vec &ut0){ ut=ut0;}
+        void getdata(vec &dt_out){dt_out = dt;  }
+
+
+        // TODO dodelat void to_setting( Setting &set ) const;
+};
+
+UIREGISTER ( mexDS );
+SHAREDPTR ( mexDS );
+
 }
 #endif //MXDS_H