Changeset 377 for library

Timestamp:

06/15/09 18:27:16 (16 years ago)

Author:

mido

Message:

1) globalni prejmenovani Setting &root na Setting &set
2) smazani par zastaralych adresaru
3) oprava warningu v doc\local
4) prejmenovani SettingsResolver? na SettingResolver? a drobne vylepseni funkcnosti
5) odstranena duplikace kodu v user_info.cpp

Files:

• library/mex/mexds.h (modified) (1 diff)

library/mex/mexds.h

@@ -1 @@
-//#include "../bdm/stat/libDS_ui.h"
+#include "../bdm/stat/libDS.h"
+#include "mexparse.h"
 
-/*! \brief Create memory data source from mxArray
+namespace bdm {
+/*!
+* \brief Memory storage of off-line data column-wise
 
-\code
-system={
-        type="mexDS";
-        varname="";            // name of workspace variable
-        rids=[1 1 1];          // numbers of data rows
-        tds =[0 1 2];          // time delays
-        };
-\endcode
+The data are stored in an internal matrix \c Data . Each column of Data corresponds to one discrete time observation \f$t\f$. Access to this matrix is via indices \c rowid and \c delays.
 
-MemDS with the above fields will be created;
+The data can be loaded from a file.
+*/
+class MexDS : public MemDS {
+                //!Default constructor
+        MexDS () {};
 
-\todo Very memory inefficient implementation. The data file is copied 2 times! 
-For better implementatin we would need MemDS with pointer to the raw data. Then it could operate directly inside mxArray.
+        /*! \brief Create memory data source from mxArray
 
-*/
-class UImexDS: public UIbuilder{
-        public:
-                UImexDS():UIbuilder("mexDS"){};
-                bdmroot* build(Setting &S) const{
-                        mat Data;
-                        ivec rids;
-                        ivec tds;
-                        try{
-                                Data = mxArray2mat(mexGetVariable("base",S["varname"]));
-                                rids=getivec(S["rids"]);
-                                tds = getivec(S["tds"]);
-                        }
-                        catch UICATCH ;
-                        
-                        MemDS* M=new MemDS(Data,rids,tds);
-                        RV* r; UIbuild(S["rv"],r);
-                        RV ru=RV();
-                        M->set_rvs(*r,ru);
-                        return M;
+        \code
+        system={
+                type="mexDS";
+                varname="";            // name of workspace variable
+                rids=[1 1 1];          // numbers of data rows
+                tds =[0 1 2];          // time delays
                 };
+        \endcode
+
+        MemDS with the above fields will be created;
+
+        \todo Very memory inefficient implementation. The data file is copied 2 times! 
+        For better implementatin we would need MemDS with pointer to the raw data. Then it could operate directly inside mxArray.
+
+        */
+        void from_setting( const Setting &set )
+        {       
+                Data = mxArray2mat(mexGetVariable("base",set["varname"]));
+                UI::get( rowid, set, "rids" );
+                it_assert_debug ( max ( rowid ) <=Data.rows(),"MemDS rowid is too high for given Dat." );
+
+                UI::get( delays, set, "tds" );
+                time = max ( delays );
+                it_assert_debug ( time < Data.cols(),"MemDS delays are too high." );
+
+                RV* r = UI::build<RV>(set,"rv");
+                RV ru=RV();
+                set_rvs(*r,ru);
+        }
+
+
+        // TODO dodelat void to_setting( Setting &set ) const;
 };
-UIREGISTER(UImexDS);
+
+UIREGISTER(MexDS);
+
+}