Changeset 728 for library/bdm/mex/config2mxstruct.h

Timestamp:

11/17/09 00:54:28 (15 years ago)

Author:

smidl

Message:

logger now has ability to store settings - used in estimator. New mexfunction epdf_mean

Files:

• library/bdm/mex/config2mxstruct.h (modified) (3 diffs)

library/bdm/mex/config2mxstruct.h

@@ -31 +31 @@
         mxArray* array2mxvector ( const Setting &setting )  {
                 if ( !setting.isArray() ) mexErrMsgTxt ( "Given setting is not an array" );
-                double *elements = new double[setting.getLength() ];
+                mxArray *result = mxCreateDoubleMatrix ( 1, setting.getLength(), mxREAL );
+                double *elements = mxGetPr(result);
                 for ( int i = 0; i < setting.getLength(); i++ ) {
                         if ( setting.getType() == Setting::TypeInt ) { //TODO: tady je chyba -- zaporna cisla nejsou TypeInt
-                                elements[i] = setting[i];
+                                elements[i] = (int) setting[i];
                         } else {
-                                elements[i] = ( int ) setting[i];
+                                elements[i] =  setting[i];
                         }
                 }
-                vec &v = * ( new vec ( elements, setting.getLength() ) );
-                mxArray *result = mxCreateDoubleMatrix ( 1, setting.getLength(), mxREAL );
-                vec2mxArray ( v, result );
-                delete &v;
-                delete [] elements;
                 return result;
         }
@@ -49 +45 @@
         //! Convert libconfig's array to Matlab matrix
         mxArray* list2mxmatrix ( const Setting &setting )  {
-                if ( !setting.isList() || ( "matrix" != setting[0] ) )
+                if ( !setting.isList() || ( strcmp("matrix", setting[0])!=0 ) )
                         mexErrMsgTxt ( "Given setting is not a matrix" );
                 int rows = setting[1];
@@ -118 +114 @@
                         return result;
                 }
-                if ( ( setting[0].getType() == Setting::TypeString ) && ( "matrix" == setting[0] ) ) {
-                        return list2mxmatrix ( setting );
+                
+                if ( ( setting[0].getType() == Setting::TypeString )){
+                        string s=(setting[0]);
+                        if (s=="matrix") {
+                                return list2mxmatrix ( setting );
+                        }
                 }
                 mxArray *result = mxCreateCellMatrix ( 1, setting.getLength() );