Changeset 1015 for library/bdm/base

Timestamp:

05/27/10 23:08:07 (14 years ago)

Author:

smidl

Message:

UI for ldmat - use it in egiw

Location:

library/bdm/base

Files:

• user_info.cpp (modified) (2 diffs)
• user_info.h (modified) (3 diffs)

library/bdm/base/user_info.cpp

@@ -257 +257 @@
                         new_field = matrix ( i, j );
                 }
+}
+
+void UI::save ( const ldmat &matrix, Setting &element, const string &name ) {
+        Setting &set = ( name == "" ) ? element.add ( Setting::TypeGroup)
+        : element.add ( name, Setting::TypeGroup );
+        
+        save (matrix._L(), set, "L");
+        save (matrix._D(), set, "D");
 }
 
@@ -371 +379 @@
 }
 
+void UI::from_setting ( ldmat& matrix, const Setting &element ) {
+        if(element.exists("L")){
+                UI::from_setting(matrix.__L(), element["L"]);
+        }
+        if(element.exists("D")){
+                UI::from_setting(matrix.__D(), element["D"]);
+        }
+        matrix.validate();
+}
+
 void UI::from_setting ( vec &vector, const Setting &element ) {
         const SettingResolver link ( element );

library/bdm/base/user_info.h

@@ -25 +25 @@
 #include "../shared_ptr.h"
 #include "itpp/itbase.h"
+#include "../math/square_mat.h"
+#include "../math/chmat.h"
 
 using std::string;
@@ -302 +304 @@
         //! This method converts a Setting into a matrix
         static void from_setting ( mat& matrix, const Setting &element );
+        //! This method converts a Setting into a ldmat
+        static void from_setting ( ldmat& matrix, const Setting &element );
         //! This method converts a Setting into an integer vector
         static void from_setting ( ivec &vector, const Setting &element );
@@ -550 +554 @@
         //! A matrix(of type mat) is stored in the new child Setting appended to the passed element
         static void save ( const mat &matrix, Setting &element, const string &name = "" );
-
+        
+        //! A matrix(of type mat) is stored in the new child Setting appended to the passed element
+        static void save ( const ldmat &matrix, Setting &element, const string &name = "" );
+        
         //! An integer vector (of type ivec) is stored in the new child Setting appended to the passed element
         static void save ( const ivec &vec, Setting &element, const string &name = "" );