Serializing of MatrixXr

Modules/LemmaCore/include/LemmaObject.h

@@ -39,7 +39,7 @@ class LemmaObject {
     /**
      *  Streams class information as YAML::Node
      */
-    friend YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject &ob) ;
+    //friend YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject &ob) ;
 
     friend class LemmaObjectDeleter;
 
@@ -64,6 +64,7 @@ class LemmaObject {
         virtual YAML::Node Serialize() const {
             std::cout.precision( 20 );
             YAML::Node node = YAML::Node();
+            //node.SetStyle(YAML::EmitterStyle::Flow);
             node.SetTag( GetName() );
             std::time_t now = std::chrono::system_clock::to_time_t( std::chrono::system_clock::now() );
             std::string ser_time =  std::string( std::ctime(&now) );

Modules/LemmaCore/include/helper.h

@@ -13,6 +13,7 @@
  * @version   $Id$
  * @author    Trevor Irons (ti)
  * @email     Trevor.Irons@xri-geo.com
+ * @copyright Copyright (c) 2017, University of Utah
  * @copyright Copyright (c) 2014, XRI Geophysics, LLC
  * @copyright Copyright (c) 2014, Trevor Irons
  */
@@ -292,24 +293,27 @@ struct convert<Lemma::MatrixXr> {
     node["cols"] = rhs.cols();
     for (int ir=0; ir<rhs.rows(); ++ir) {
         for (int ic=0; ic<rhs.cols(); ++ic) {
-            node["data"].push_back( rhs(ir,ic) );
+            node[ir][ic] = rhs(ir,ic);
         }
+        node[ir].SetStyle(YAML::EmitterStyle::Flow);
     }
+    //node.SetStyle(YAML::EmitterStyle::Block);
     node.SetTag( "MatrixXr" );
     return node;
   }
 
-//   static bool decode(const Node& node, Lemma::Vector3r& rhs) {
-//     if( node.Tag() != "Vector3r" ) {
-//         return false;
-//     }
-//     int ir=0;
-//     for(YAML::const_iterator it=node[0].begin(); it!=node[0].end(); ++it) {
-//         rhs(ir) = it->as<Lemma::Real>();
-//         ++ir;
-//     }
-//     return true;
-//   }
+  static bool decode(const Node& node, Lemma::MatrixXr& rhs) {
+    if( node.Tag() != "MatrixXr" ) {
+        return false;
+    }
+    rhs.resize( node["rows"].as<int>(), node["cols"].as<int>() );
+    int ir=0;
+    for(YAML::const_iterator it=node[0].begin(); it!=node[0].end(); ++it) {
+        rhs(ir) = it->as<Lemma::Real>();
+        ++ir;
+    }
+    return true;
+  }
 
 };
 

Modules/LemmaCore/src/LemmaObject.cpp

@@ -15,11 +15,12 @@
 
 namespace Lemma {
 
-    YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject& ob) {
-        out << YAML::BeginMap;
-        out << YAML::Key <<"Class Name"    << YAML::Value << ob.GetName();
-        return out;
-    }
+//     YAML::Emitter& operator << (YAML::Emitter& out, const LemmaObject& ob) {
+//         out << YAML::Flow;
+//         out << YAML::BeginMap;
+//         out << YAML::Key <<"Class Name"    << YAML::Value << ob.GetName();
+//         return out;
+//     }
 
     // ====================  LIFECYCLE     ==============================