diff --git a/Structures.h b/Structures.h index 8483d865c9aceb9e2094f0ecb3bdeb39608aa669..53516c52222227393e4eb194705b29e788ac7a59 100644 --- a/Structures.h +++ b/Structures.h @@ -4,7 +4,11 @@ #include #include #include "iostream" + using namespace std; + +//!!! Между объявлениями должна быть 1-2 строки для лучшей читаемости + struct Node{ int id; double x, y, z; @@ -13,11 +17,18 @@ struct Node{ friend std::ostream &operator<<(std::ostream &, const vector &); friend std::ostream &operator<<(std::ostream &, const set &); friend std::ostream &operator<<(std::ostream &, const map &); + friend bool operator <(const Node &lhs, const Node &rhs) - { return lhs.id < rhs.id; }; + { + return lhs.id < rhs.id; + }; + friend bool operator >(const Node &lhs, const Node &rhs) - { return lhs.id > rhs.id; }; + { + return lhs.id > rhs.id; + }; }; + struct FiniteElement{ int fe_id; int mat_id; @@ -26,6 +37,7 @@ struct FiniteElement{ friend std::ostream &operator<<(std::ostream &, const FiniteElement &); friend std::ostream &operator<<(std::ostream &, const std::vector &); }; + struct BoundaryFiniteElement : public FiniteElement{ int bfe_id; int border_id;