Changeset 895 for library/bdm/mex

Timestamp:

04/08/10 16:01:03 (14 years ago)

Author:

smidl

Message:

get rid of Yrv in DS

Location:

library/bdm/mex

Files:

• mex_datasource.h (modified) (5 diffs)
• mex_logger.h (modified) (1 diff)

library/bdm/mex/mex_datasource.h

@@ -45 +45 @@
                 rowid = linspace ( 0, Data.rows() - 1 );
                 dtsize = rowid.length();
-                ytsize = rowid.length();
                 utsize = 0;
 
@@ -87 +86 @@
         mexDS () : DS() {};
 
-        /*! \brief Create memory data source from mxArray
+        /*! \brief Data source computed by matlab function
 
         \code
@@ -94 +93 @@
                 step_name="";              // name of function to call
                 input_name="";             // name of workspace variable where inputs are written
-                yrv = {class='RV',...}  // identification of outputs
+                drv = {class='RV',...}  // identification of outputs
                 urv = {class='RV',...}   // identification of inputs
                 };
@@ -106 +105 @@
                 UI::get ( input_name, set, "input_name", UI::compulsory );
 
-                shared_ptr<RV> ry = UI::build<RV> ( set, "yrv", UI::compulsory );
+                shared_ptr<RV> rd = UI::build<RV> ( set, "drv", UI::compulsory );
                 shared_ptr<RV> ru = UI::build<RV> ( set, "urv", UI::compulsory );
 
-                ytsize = ry->_dsize();
+                dtsize = rd->_dsize();
                 utsize = ru->_dsize();
-                dtsize = ytsize + utsize;
 
-                set_drv ( *ry, *ru );
+                set_drv ( *rd, *ru );
                 validate();
         }
@@ -142 +140 @@
                 mexCallMATLAB ( 1, &tmp, 0, ( mxArray ** ) &dummy, step_name.c_str() );
                 // save its results
-                bdm_assert_debug ( ( int ) mxGetM ( tmp ) == ytsize || ( int ) mxGetN ( tmp ) == ytsize, "mexDS.step() expected return vector of length " + num2str ( dtsize ) +
+                bdm_assert_debug ( ( int ) mxGetM ( tmp ) == dtsize || ( int ) mxGetN ( tmp ) == dtsize, "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 ) {

library/bdm/mex/mex_logger.h

@@ -62 +62 @@
                         istart = 0;
                         for ( int j = 0; j < entries ( i ).length(); j++ ) { // same for as in add!!!
-                                vec_name = names ( i ) + prefix_sep() + entries ( i ).name ( j );
+                                vec_name = names ( i ) + "_" + entries ( i ).name ( j );
                                 iend = istart + entries ( i ).size ( j ) - 1;
                                 M = vectors ( i ).get_cols ( istart, iend );