Changeset 334

Timestamp:

05/04/09 15:09:08 (16 years ago)

Author:

miro

Message:

getvec and getmat are compatible with mxstruct2config output
not yet tested, but the former functionality should be unchanged

Files:

• bdm/uibuilder.h (modified) (2 diffs)

bdm/uibuilder.h

@@ -42 +42 @@
 //! construct itpp::vec from Setting of type Array
 inline vec getvec ( Setting& S ) {
-        CHECK_UITYPE ( S,TypeArray );
-        vec tmp;
-        tmp.set_size ( S.getLength() );
-        for ( int i=0;i<S.getLength();i++ ) {
-                switch ( S[i].getType() ) {
-                        case Setting::TypeFloat :
-                                tmp[i]=double ( S[i] );break;
-                        case Setting::TypeInt :
-                                tmp[i]=int ( S[i] );break;
-                        case Setting::TypeBoolean :
-                                tmp[i]=bool ( S[i] );break;
-                        default: it_error ( "libconfig error?" );
-                }
-        }
-        return tmp;
+        vec vector;
+        if (S.getType() == Setting::TypeArray) {        
+                vector.set_size ( S.getLength() );
+                for ( int i=0;i<S.getLength();i++ ) {
+                        switch ( S[i].getType() ) {
+                                case Setting::TypeFloat :
+                                        vector[i]=double ( S[i] );break;
+                                case Setting::TypeInt :
+                                        vector[i]=int ( S[i] );break;
+                                case Setting::TypeBoolean :
+                                        vector[i]=bool ( S[i] );break;
+                                default: it_error ( "libconfig error?" );
+                        }
+                }
+        } else if (S.getType() == Setting::TypeGroup) {
+                vector = getvec(S["elements"]);
+                int cols = S["cols"];
+                if (vector.length() != cols) { 
+                        it_error("requested vector is a matrix");
+                }
+        } else {
+                it_error("requested vector has invalid type");
+        }
+        return vector;
 };
 
@@ -82 +91 @@
 };
 
+//! construct itpp::mat from Setting of type Group containing settings
+//! "elements" and "cols"
+inline mat getmat (Setting & S) {
+        CHECK_UITYPE (S, TypeGroup);
+        return getmat(S["elements"], S["cols"]);
+}
+
 //! construct itpp::ivec from Setting of type Array