Changeset 413

Timestamp:

07/07/09 23:09:17 (15 years ago)

Author:

miro

Message:

several fixes of config2mxstruct.h
it still doesn't work properly but the bug is found and marked

Location:

library

Files:

• bdm/mex/config2mxstruct.h (modified) (3 diffs)
• system/SetBdmEnv.cmake (modified) (1 diff)

library/bdm/mex/config2mxstruct.h

@@ -26 +26 @@
                 double *elements = new double[setting.getLength()];
                 for (int i=0; i<setting.getLength(); i++) {
-                        elements[i] = setting[i];
+                        if (setting.getType() == Setting::TypeInt) { //TODO: tady je chyba -- zaporna cisla nejsou TypeInt
+                                elements[i] = setting[i];
+                        } else {
+                                elements[i] = (int) setting[i];
+                        }
                 }
                 vec &v = *(new vec(elements, setting.getLength()));
-                mxArray *result;
+                mxArray *result = mxCreateDoubleMatrix(1, setting.getLength(), mxREAL);
                 vec2mxArray(v, result);
                 delete &v;
@@ -48 +52 @@
                 }
                 mat &m = *(new mat(elements, rows, cols));
-                mxArray *result;
+                mxArray *result = mxCreateDoubleMatrix(rows, cols, mxREAL);
                 mat2mxArray(m, result);
                 delete &m;
@@ -101 +105 @@
         mxArray* list2mxcell(const Setting &setting)  {
                 if (!setting.isList()) mexErrMsgTxt("Given setting is not a list.");
+                if (setting.getLength() == 0) {
+                        mxArray *result = mxCreateCellMatrix(1, 0);
+                        return result;
+                }
                 if ((setting[0].getType() == Setting::TypeString) && ("matrix" == setting[0])) {
                         return list2mxmatrix(setting);

library/system/SetBdmEnv.cmake

@@ -89 +89 @@
                         target_link_libraries (${FN} ${FRAMEWORK_VECLIB})
                 ENDIF(APPLE)
-#               target_link_libraries (${FN} itpp)      
-                target_link_libraries (${FN} debug itpp_debug)
-                target_link_libraries (${FN} optimized itpp)
+                target_link_libraries (${FN} itpp)      
+#               target_link_libraries (${FN} debug itpp_debug)
+#               target_link_libraries (${FN} optimized itpp)
         ENDIF(WIN32)
         target_link_libraries (${FN} bdm)