diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h index 633279e4cdd170b8c605dcd0f63e7d270b92a742..d60be1266eba957734d5e8e99bd0560f15d0da8d 100644 --- a/Framework/Geometry/Point.h +++ b/Framework/Geometry/Point.h @@ -3,13 +3,13 @@ #include "BaseVector.h" #include "QuantityVector.h" +#include "Vector.h" #include <phys/units/quantity.hpp> class Point : public BaseVector<phys::units::length_d> { using Length = phys::units::quantity<phys::units::length_d, double>; - public: Point(CoordinateSystem const& pCS, QuantityVector<phys::units::length_d> pQVector) : BaseVector<phys::units::length_d>(pCS, pQVector) @@ -43,6 +43,17 @@ public: BaseVector<phys::units::length_d>::qVector = getCoordinates(pCS); BaseVector<phys::units::length_d>::cs = &pCS; } + + Point operator+(Vector<phys::units::length_d> const& pVec) const + { + return Point(*BaseVector<phys::units::length_d>::cs, getCoordinates() + pVec.getComponents(*BaseVector<phys::units::length_d>::cs)); + } + + Vector<phys::units::length_d> operator-(Point const& pB) const + { + auto& cs = *BaseVector<phys::units::length_d>::cs; + return Vector<phys::units::length_d>(cs, getCoordinates() - pB.getCoordinates(cs)); + } }; #endif diff --git a/Framework/Geometry/QuantityVector.h b/Framework/Geometry/QuantityVector.h index 647303791fae300e03b9ad44ab7b79bea0552ef6..c874f2277768231a2bef48fce9d5cee28f8d5f2f 100644 --- a/Framework/Geometry/QuantityVector.h +++ b/Framework/Geometry/QuantityVector.h @@ -29,6 +29,23 @@ public: { return Quantity(phys::units::detail::magnitude_tag, eVector[index]); } + + Quantity norm() const + { + return Quantity(phys::units::detail::magnitude_tag, eVector.norm()); + } + + auto operator+(QuantityVector<dim> const& pQVec) const + { + return QuantityVector<dim>(eVector + pQVec.eVector); + } + + auto operator-(QuantityVector<dim> const& pQVec) const + { + return QuantityVector<dim>(eVector - pQVec.eVector); + } + + //auto operator*( }; template <typename dim> diff --git a/Framework/Geometry/Vector.h b/Framework/Geometry/Vector.h index bf8ab9d40a14a7ff5d4eb2c263477efa79416947..6e8b7fbbc38d1526950a15e1a53ae9b2f05e1b85 100644 --- a/Framework/Geometry/Vector.h +++ b/Framework/Geometry/Vector.h @@ -10,13 +10,12 @@ class Vector : public BaseVector<dim> { using Quantity = phys::units::quantity<dim, double>; +public: Vector(CoordinateSystem const& pCS, QuantityVector<dim> pQVector) : - BaseVector<Quantity>(pCS, pQVector) + BaseVector<dim>(pCS, pQVector) { } - - -public: + Vector(CoordinateSystem const& cs, Quantity x, Quantity y, Quantity z) : BaseVector<dim>(cs, QuantityVector<dim>(x, y, z)) { @@ -47,7 +46,7 @@ public: auto norm() const { - return Quantity(BaseVector<dim>::qVector.eVector.norm()); + return BaseVector<dim>::qVector.norm(); } //~ template <typename dim2>