Data3D.

Author: Tristan Youngs

src/math/data3D.cpp

@@ -440,3 +440,30 @@ bool Data3D::serialise(LineParser &parser) const
 
     return true;
 }
+
+// Express as a serialisable value
+void Data3D::serialise(std::string tag, SerialisedValue &target) const
+{
+    target[tag] = {{"tag", tag_}, {"x", x_}, {"y", y_}, {"z", z_}, {"values", values_.linearArray()}};
+    if (hasError_)
+        target[tag]["errors"] = errors_.linearArray();
+}
+
+// Read values from a serialisable value
+void Data3D::deserialise(const SerialisedValue &node)
+{
+    tag_ = toml::find<std::string>(node, "tag");
+    x_ = toml::find<std::vector<double>>(node, "x");
+    y_ = toml::find<std::vector<double>>(node, "y");
+    z_ = toml::find<std::vector<double>>(node, "z");
+    values_.initialise(x_.size(), y_.size(), z_.size());
+    values_.linearArray() = toml::find<std::vector<double>>(node, "values");
+
+    Serialisable::optionalOn(node, "errors",
+                             [this](const auto errors)
+                             {
+                                 hasError_ = true;
+                                 errors_.initialise(x_.size(), y_.size(), z_.size());
+                                 errors_.linearArray() = toml::get<std::vector<double>>(errors);
+                             });
+}

src/math/data3D.h

@@ -11,7 +11,7 @@
 class Histogram3D;
 
 // One-Dimensional Data
-class Data3D : public Data3DBase
+class Data3D : public Data3DBase, public Serialisable<>
 {
     public:
     Data3D();
@@ -122,4 +122,8 @@ class Data3D : public Data3DBase
     bool deserialise(LineParser &parser);
     // Write data through specified LineParser
     bool serialise(LineParser &parser) const;
+    // Express as a serialisable value
+    void serialise(std::string tag, SerialisedValue &target) const override;
+    // Read values from a serialisable value
+    void deserialise(const SerialisedValue &node) override;
 };