From 902f4876a0bfbc5f98c4f116eaad5df69c1aadd4 Mon Sep 17 00:00:00 2001 From: AnastasiaDolotova Date: Wed, 28 Sep 2022 14:56:29 +0300 Subject: [PATCH] Refactoring --- DataTypes.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/DataTypes.h b/DataTypes.h index 0fd15a8..2ea1e9f 100644 --- a/DataTypes.h +++ b/DataTypes.h @@ -28,15 +28,16 @@ struct FiniteElement { FiniteElement() = default; FiniteElement(unsigned int p_ID, unsigned int p_areaID, - std::vector p_nodesID) : ID(p_ID), - areaID(p_areaID), nodesID(std::move(p_nodesID)) {} + std::vector &p_nodesID) : ID(p_ID), + areaID(p_areaID), nodesID(p_nodesID) {} friend std::ostream &operator<<(std::ostream &ost, const FiniteElement &element) { ost << "ID: " << element.ID << ", area ID: " << element.areaID << ", nodes ID: {"; for (unsigned int nodeID: element.nodesID) { ost << nodeID << " "; } - ost << "}"; + ost << "\b" << "}"; + return ost; } }; @@ -50,4 +51,13 @@ struct BoundaryElement { BoundaryElement(unsigned int p_ID, unsigned int p_boundaryID, std::vector p_nodesID) : ID(p_ID), boundaryID(p_boundaryID), nodesID(std::move(p_nodesID)) {} + + friend std::ostream &operator<<(std::ostream &ost, const BoundaryElement &element) { + ost << "ID: " << element.ID << ", boundary ID: " << element.boundaryID << ", nodes ID: {"; + for (unsigned int nodeID: element.nodesID) { + ost << nodeID << " "; + } + ost << "\b" << "}"; + return ost; + } }; \ No newline at end of file -- GitLab