Add internal variable values in before/after trace

src/artis/kernel/AbstractAtomicModel.hpp

@@ -60,9 +60,19 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
                                                          utils::KERNEL)
-            << " - AFTER - "
+            << "AFTER - "
             << AbstractAtomicModel < T, U, V >::path(this);
         utils::Trace < utils::DoubleTime >::trace().flush();
+        for (size_t i = 0; i < Internals < T, U >::size(); ++i) {
+            if (not Internals < T, U >::get(i).is_null()) {
+                utils::Trace < utils::DoubleTime >::trace()
+                    << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
+                                                                 utils::KERNEL)
+                    << i << " = " << Internals < T, U >::get(i).to_string(
+                        dynamic_cast < const T* >(this));
+                utils::Trace < utils::DoubleTime >::trace().flush();
+            }
+        }
 #else
         (void) t;
 #endif
@@ -76,9 +86,19 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
                                                          utils::KERNEL)
-            << " - BEFORE - "
+            << "BEFORE - "
             << AbstractAtomicModel < T, U, V >::path(this);
         utils::Trace < utils::DoubleTime >::trace().flush();
+        for (size_t i = 0; i < Internals < T, U >::size(); ++i) {
+            if (not Internals < T, U >::get(i).is_null()) {
+                utils::Trace < utils::DoubleTime >::trace()
+                    << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
+                                                                 utils::KERNEL)
+                    << i << " = " << Internals < T, U >::get(i).to_string(
+                        dynamic_cast < const T* >(this));
+                utils::Trace < utils::DoubleTime >::trace().flush();
+            }
+        }
 #else
         (void) t;
 #endif

src/artis/kernel/AbstractCoupledModel.hpp

@@ -70,9 +70,19 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
                                                          utils::KERNEL)
-            << " - AFTER - "
+            << "AFTER - "
             << AbstractCoupledModel < T, U, V, W >::path(this);
         utils::Trace < utils::DoubleTime >::trace().flush();
+                for (size_t i = 0; i < Internals < T, U >::size(); ++i) {
+            if (not Internals < T, U >::get(i).is_null()) {
+                utils::Trace < utils::DoubleTime >::trace()
+                    << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
+                                                                 utils::KERNEL)
+                    << i << " = " << Internals < T, U >::get(i).to_string(
+                        dynamic_cast < const T* >(this));
+                utils::Trace < utils::DoubleTime >::trace().flush();
+            }
+        }
 #else
         (void) t;
 #endif
@@ -98,9 +108,19 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
                                                          utils::KERNEL)
-            << " - BEFORE - "
+            << "BEFORE - "
             << AbstractCoupledModel < T, U, V, W >::path(this);
         utils::Trace < utils::DoubleTime >::trace().flush();
+                for (size_t i = 0; i < Internals < T, U >::size(); ++i) {
+            if (not Internals < T, U >::get(i).is_null()) {
+                utils::Trace < utils::DoubleTime >::trace()
+                    << utils::TraceElement < utils::DoubleTime >("KERNEL", t,
+                                                                 utils::KERNEL)
+                    << i << " = " << Internals < T, U >::get(i).to_string(
+                        dynamic_cast < const T* >(this));
+                utils::Trace < utils::DoubleTime >::trace().flush();
+            }
+        }
 #else
         (void) t;
 #endif

src/artis/kernel/Externals.hpp

@@ -70,7 +70,7 @@ public:
     void external(unsigned int index, V T::* var)
     {
         if (externals.size() <= index) {
-            externals.resize(index + 1);
+            externals.resize(index + 1, std::make_pair(-1, Any()));
         }
         externals[index] = std::make_pair(-1, var);
     }
@@ -97,6 +97,9 @@ public:
         }
     }
 
+    unsigned int size() const
+    { return externals.size(); }
+
 protected:
     bool updated;
     std::vector < std::pair < typename U::type, Any > > externals;

src/artis/kernel/Internals.hpp

@@ -61,7 +61,7 @@ public:
     void internal(unsigned int index, V T::* var)
     {
         if (internals.size() <= index) {
-            internals.resize(index + 1);
+            internals.resize(index + 1, Any());
         }
         internals[index] = Any(var);
     }
@@ -112,6 +112,9 @@ public:
         // }
     }
 
+    unsigned int size() const
+    { return internals.size(); }
+
 private:
     std::vector < Any > internals;
 };

src/artis/kernel/Value.hpp

@@ -82,6 +82,9 @@ public:
     V T::* get() const
     { return dynamic_cast < data < T, V >* >(ptr_)->value_; }
 
+    bool is_null() const
+    { return ptr_ == nullptr; }
+
     template < typename T, typename V >
     void put(T* o, const V& value )
     {
@@ -94,24 +97,24 @@ public:
     std::string to_string(const T* o) const
     {
         if (ptr_) {
-            try {
-                double T::* p = dynamic_cast <
-                    data < T, double >* >(ptr_)->value_;
-
-                return std::to_string(o->*(p));
-            } catch(...) {
-                try {
-                    int T::* p = dynamic_cast <
-                        data < T, int >* >(this->ptr_)->value_;
-
-                    return std::to_string(o->*(p));
-                } catch(...) {
-                    try {
-                        bool T::* p = dynamic_cast <
-                            data < T, bool >* >(this->ptr_)->value_;
-
-                        return std::to_string(o->*(p));
-                    } catch(...) {
+            data < T, double >* q_double =
+                dynamic_cast < data < T, double >* >(ptr_);
+
+            if (q_double) {
+                return std::to_string(o->*(q_double->value_));
+            } else {
+                data < T, int >* q_int =
+                    dynamic_cast < data < T, int >* >(ptr_);
+
+                if (q_int) {
+                    return std::to_string(o->*(q_int->value_));
+                } else {
+                    data < T, bool >* q_bool =
+                        dynamic_cast < data < T, bool >* >(ptr_);
+
+                    if (q_bool) {
+                        return std::to_string(o->*(q_bool->value_));
+                    } else {
                         return "NA";
                     }
                 }

src/test/test.cpp

@@ -119,6 +119,8 @@ int main()
     simulator.run(artis::utils::DateTime::toJulianDayNumber("2016-1-1"),
                   artis::utils::DateTime::toJulianDayNumber("2016-1-10"));
 
+    std::cout << ::Trace::trace().elements().to_string() << std::endl;
+
     AnOutput output(simulator.observer());
 
     output();