Added base class. Added getDrawingRadius() function

beam.hpp

@@ -1,15 +1,14 @@
 #ifndef BEAM_HPP
 #define BEAM_HPP
+#include "nlohmann/json.hpp"
 #include <assert.h>
 #include <cmath>
 #include <iostream>
 #include <string>
 
-struct RectangularBeamDimensions {
-  inline static std::string name{"Rectangular"};
-  double b;
-  double h;
-
+struct BeamDimensions
+{
+    double dim1, dim2;
     double A{0}; // cross sectional area
 
     struct MomentsOfInertia
@@ -19,43 +18,121 @@ struct RectangularBeamDimensions {
         double J{0};  // torsional constant (polar moment of inertia)
     } inertia;
 
-  RectangularBeamDimensions(const double &width, const double &height) : b(width), h(height)
+public:
+    double getDim1() const;
+    double getDim2() const;
+
+    virtual void to_json(nlohmann::json &j, const BeamDimensions &beamDim) const;
+
+    virtual void from_json(const nlohmann::json &j, BeamDimensions &beamDim) const;
+    virtual double getDrawingRadius() const = 0;
+};
+
+inline double BeamDimensions::getDim2() const
+{
+    return dim2;
+}
+
+inline void BeamDimensions::to_json(nlohmann::json &j, const BeamDimensions &beamDim) const
+{
+    j = nlohmann::json{{"BeamDimension.dim1", beamDim.dim1}, {"BeamDimension.dim2", beamDim.dim2}};
+}
+
+inline void BeamDimensions::from_json(const nlohmann::json &j, BeamDimensions &beamDim) const
+{
+    const std::string jsonKey_dim1 = "BeamDimension.dim1";
+    const std::string jsonKey_dim2 = "BeamDimension.dim2";
+    if (j.contains(jsonKey_dim1)) {
+        j.at(jsonKey_dim1).get_to(beamDim.dim1);
+    }
+    if (j.contains(jsonKey_dim2)) {
+        j.at(jsonKey_dim2).get_to(beamDim.dim2);
+    }
+}
+
+inline double BeamDimensions::getDim1() const
+{
+    return dim1;
+}
+
+struct RectangularBeamDimensions : public BeamDimensions
+{
+    inline static std::string name{"Rectangular"};
+    inline const static double defaultSize = 0.002;
+
+    RectangularBeamDimensions(const double &width, const double &height)
     {
         assert(width > 0 && height > 0);
+        dim1 = width;
+        dim2 = height;
         updateProperties();
     }
-  RectangularBeamDimensions() : b(0.002), h(0.002) { updateProperties(); }
-  std::string toString() const {
-    return std::string("b=") + std::to_string(b) + std::string(" h=") +
-           std::to_string(h);
+    RectangularBeamDimensions()
+    {
+        dim1 = defaultSize;
+        dim2 = defaultSize;
+        updateProperties();
+    }
+
+    std::string toString() const
+    {
+        return std::string("w=") + std::to_string(dim1) + std::string(" h=") + std::to_string(dim2);
     }
 
     void updateProperties()
     {
-      A = b * h;
-      inertia.I2 = b * std::pow(h, 3) / 12;
-      inertia.I3 = h * std::pow(b, 3) / 12;
+        A = dim1 * dim2;
+        inertia.I2 = dim1 * std::pow(dim2, 3) / 12;
+        inertia.I3 = dim2 * std::pow(dim1, 3) / 12;
         inertia.J = inertia.I2 + inertia.I3;
     }
     static void computeMomentsOfInertia(const RectangularBeamDimensions &dimensions,
                                         MomentsOfInertia &inertia);
+    double getWidth() const { return dim1; }
+    double getHeight() const { return dim2; }
+    double getDrawingRadius() const override;
 };
 
-struct CylindricalBeamDimensions {
-  inline static std::string name{"Cylindrical"};
-  double od; // Cylinder outside diameter
-  double
-      id; // Cylinder inside diameter
-          // https://www.engineeringtoolbox.com/area-moment-inertia-d_1328.html
-  CylindricalBeamDimensions(const double &outsideDiameter,
-                            const double &insideDiameter)
-      : od(outsideDiameter), id(insideDiameter) {
-    assert(outsideDiameter > 0 && insideDiameter > 0 &&
-           outsideDiameter > insideDiameter);
+inline double RectangularBeamDimensions::getDrawingRadius() const
+{
+    return getWidth() / std::sqrt(2);
 }
-  CylindricalBeamDimensions() : od(0.03), id(0.026) {}
+
+struct CylindricalBeamDimensions : public BeamDimensions
+{
+    inline static std::string name{"Cylindrical"};
+    // https://www.engineeringtoolbox.com/area-moment-inertia-d_1328.html
+    CylindricalBeamDimensions(const double &outsideDiameter, const double &insideDiameter)
+    {
+        assert(outsideDiameter > 0 && insideDiameter > 0 && outsideDiameter > insideDiameter);
+        dim1 = insideDiameter;
+        dim2 = outsideDiameter;
+        updateProperties();
+    }
+    CylindricalBeamDimensions()
+    {
+        dim1 = 0.026;
+        dim2 = 0.03;
+        updateProperties();
+    }
+    void updateProperties()
+    {
+        A = M_PI * (std::pow(getOutterDiameter(), 2) - std::pow(getInnerDiameter(), 2)) / 4;
+        inertia.I2 = M_PI * (std::pow(getOutterDiameter(), 4) - std::pow(getInnerDiameter(), 4))
+                     / 64;
+        inertia.I3 = inertia.I2;
+        inertia.J = inertia.I2 + inertia.I3;
+    }
+    double getInnerDiameter() const { return dim1; }
+    double getOutterDiameter() const { return dim2; }
+    double getDrawingRadius() const override;
 };
 
+inline double CylindricalBeamDimensions::getDrawingRadius() const
+{
+    return getOutterDiameter();
+}
+
 struct ElementMaterial
 {
     double poissonsRatio;