Polymorphic clone for CRT Pattern in templates (basically a static_cast for concrete initializations of template class)

src/blackmisc/coordinatened.h

@@ -1,4 +1,4 @@
-/*  Copyright (C) 2013 VATSIM Community / authors
+/*  Copyright (C) 2013 VATSIM Community / contributors
  *  This Source Code Form is subject to the terms of the Mozilla Public
  *  License, v. 2.0. If a copy of the MPL was not distributed with this
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -58,6 +58,14 @@ public:
      */
     CCoordinateNed(const CCoordinateGeodetic &referencePosition, double north, double east, double down) : CVector3DBase(north, east, down), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
+    /*!
+     * \brief Constructor by values
+     * \param north
+     * \param east
+     * \param down
+     */
+    CCoordinateNed(double north, double east, double down) : CVector3DBase(north, east, down), m_referencePosition(), m_hasReferencePosition(false) {}
+
     /*!
      * \brief Copy constructor
      * \param otherNed

src/blackmisc/geolatlonbase.cpp

@@ -1,15 +0,0 @@
-#include "geolatitude.h"
-
-namespace BlackMisc
-{
-namespace Geo
-{
-
-
-// see here for the reason of thess forward instantiations
-// http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html
-// template class CGeoLatLonBase<CGeoLatitude>;
-
-}
-
-}

src/blackmisc/log.cpp

@@ -148,6 +148,7 @@ namespace BlackMisc
             return *it;
         }
     }
+    return NULL;
 }
 
 void CLog::dettachDisplay(ILogDisplay *logDisplay)

src/blackmisc/mathmatrixbase.h

@@ -31,6 +31,15 @@ protected:
      */
     QString stringForConverter() const;
 
+    /*!
+     * \brief Clone as conrete implementation
+     * \return
+     */
+    ImplMatrix clone() const
+    {
+        return static_cast<ImplMatrix const &>(*this);
+    }
+
 public:
     /*!
      * \brief Default constructor
@@ -109,8 +118,7 @@ public:
      */
     ImplMatrix operator *(double factor) const
     {
-        ImplMatrix m;
+        ImplMatrix m = this->clone();
-        m += (*this);
         m *= factor;
         return m;
     }
@@ -151,8 +159,7 @@ public:
      */
     ImplMatrix operator /(double factor) const
     {
-        ImplMatrix m(0);
+        ImplMatrix m = this->clone();
-        m += (*this);
         m /= factor;
         return m;
     }
@@ -175,8 +182,7 @@ public:
      */
     ImplMatrix operator +(const ImplMatrix &otherMatrix) const
     {
-        ImplMatrix m(0);
+        ImplMatrix m = this->clone();
-        m += (*this);
         m += otherMatrix;
         return m;
     }
@@ -199,8 +205,7 @@ public:
      */
     ImplMatrix operator -(const ImplMatrix &otherMatrix) const
     {
-        ImplMatrix m(0);
+        ImplMatrix m = this->clone();
-        m += (*this);
         m -= otherMatrix;
         return m;
     }
@@ -220,9 +225,7 @@ public:
      */
     bool isIdentityEpsilon() const
     {
-        ImplMatrix m(0.0);
+        ImplMatrix m = this->clone().round();
-        m += (*this);
-        m.round();
         return m.isIdentity();
     }
 
@@ -257,9 +260,7 @@ public:
      */
     bool isZeroEpsilon() const
     {
-        ImplMatrix m(0.0);
+        ImplMatrix m = this->clone().round();
-        m += (*this);
-        m.round();
         return m.isZero();
     }
 
@@ -277,6 +278,7 @@ public:
 
     /*!
      * \brief Round all values
+     * \return
      */
     ImplMatrix &round();
 

src/blackmisc/mathvector3dbase.cpp

@@ -16,7 +16,7 @@ namespace Math
 /*
  * Convert to string
  */
-template <class ImplClass> QString CVector3DBase<ImplClass>::stringForConverter() const
+template <class ImplVector> QString CVector3DBase<ImplVector>::stringForConverter() const
 {
     QString s = ("{%1, %2, %3}");
     s = s.arg(QString::number(this->m_i, 'f')).
@@ -28,7 +28,7 @@ template <class ImplClass> QString CVector3DBase<ImplClass>::stringForConverter(
 /*
  * Vector to zero
  */
-template <class ImplClass> void CVector3DBase<ImplClass>::setZero()
+template <class ImplVector> void CVector3DBase<ImplVector>::setZero()
 {
     this->fill(0.0);
 }
@@ -36,7 +36,7 @@ template <class ImplClass> void CVector3DBase<ImplClass>::setZero()
 /*
  * Vector to zero
  */
-template <class ImplClass> void CVector3DBase<ImplClass>::fill(double value)
+template <class ImplVector> void CVector3DBase<ImplVector>::fill(double value)
 {
     this->m_i = value;
     this->m_j = value;
@@ -46,7 +46,7 @@ template <class ImplClass> void CVector3DBase<ImplClass>::fill(double value)
 /*
  * Element
  */
-template <class ImplClass> double CVector3DBase<ImplClass>::getElement(size_t row) const
+template <class ImplVector> double CVector3DBase<ImplVector>::getElement(size_t row) const
 {
     double d;
     switch (row)
@@ -71,7 +71,7 @@ template <class ImplClass> double CVector3DBase<ImplClass>::getElement(size_t ro
 /*
  * Set given element
  */
-template <class ImplClass> void CVector3DBase<ImplClass>::setElement(size_t row, double value)
+template <class ImplVector> void CVector3DBase<ImplVector>::setElement(size_t row, double value)
 {
     switch (row)
     {
@@ -94,9 +94,9 @@ template <class ImplClass> void CVector3DBase<ImplClass>::setElement(size_t row,
 /*
  * Cross product
  */
-template <class ImplClass> ImplClass CVector3DBase<ImplClass>::crossProduct(const ImplClass &otherVector) const
+template <class ImplVector> ImplVector CVector3DBase<ImplVector>::crossProduct(const ImplVector &otherVector) const
 {
-    ImplClass v(otherVector);
+    ImplVector v(otherVector);
     v.m_i = this->m_j * otherVector.m_k - this->m_k * otherVector.m_j;
     v.m_j = this->m_k * otherVector.m_i - this->m_i * otherVector.m_k;
     v.m_k = this->m_i * otherVector.m_j - this->m_j * otherVector.m_i;
@@ -106,7 +106,7 @@ template <class ImplClass> ImplClass CVector3DBase<ImplClass>::crossProduct(cons
 /*
  * Cross product
  */
-template <class ImplClass> double CVector3DBase<ImplClass>::dotProduct(const ImplClass &otherVector) const
+template <class ImplVector> double CVector3DBase<ImplVector>::dotProduct(const ImplVector &otherVector) const
 {
     return this->m_i * otherVector.m_i + this->m_j * otherVector.m_j + this->m_k * otherVector.m_k;
 }
@@ -115,7 +115,7 @@ template <class ImplClass> double CVector3DBase<ImplClass>::dotProduct(const Imp
 /*
  * Multiply with matrix
  */
-template <class ImplClass> void CVector3DBase<ImplClass>::matrixMultiplication(const CMatrix3x3 &matrix)
+template <class ImplVector> void CVector3DBase<ImplVector>::matrixMultiplication(const CMatrix3x3 &matrix)
 {
     CMatrix3x1 m = matrix * (this->toMatrix3x1());
     this->m_i = m(0, 0);
@@ -126,7 +126,7 @@ template <class ImplClass> void CVector3DBase<ImplClass>::matrixMultiplication(c
 /*
  * Convert to matrix
  */
-template <class ImplClass> CMatrix3x1 CVector3DBase<ImplClass>::toMatrix3x1() const
+template <class ImplVector> CMatrix3x1 CVector3DBase<ImplVector>::toMatrix3x1() const
 {
     return CMatrix3x1(this->m_i, this->m_j, this->m_k);
 }

src/blackmisc/mathvector3dbase.h

@@ -21,7 +21,7 @@ class CMatrix3x1; // forward declaration
 /*!
  * \brief 3D vector base (x, y, z)
  */
-template <class ImplClass> class CVector3DBase : public CBaseStreamStringifier<ImplClass>
+template <class ImplVector> class CVector3DBase : public CBaseStreamStringifier<ImplVector>
 {
 protected:
 
@@ -61,6 +61,16 @@ protected:
      */
     virtual QString stringForConverter() const;
 
+    /*!
+     * \brief Clone as concrete implementation
+     * \return
+     */
+    ImplVector clone() const
+    {
+        return static_cast<ImplVector const &>(*this);
+    }
+
+
 public:
 
     // getter and setters are implemented in the derived classes
@@ -90,7 +100,7 @@ public:
      */
     bool isZeroEpsilon() const
     {
-        ImplClass v;
+        ImplVector v;
         v += (*this);
         v.round();
         return v.isZero();
@@ -186,10 +196,9 @@ public:
      * \param otherVector
      * \return
      */
-    ImplClass operator +(const ImplClass &otherVector) const
+    ImplVector operator +(const ImplVector &otherVector) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v += otherVector;
         return v;
     }
@@ -212,10 +221,9 @@ public:
      * \param otherVector
      * \return
      */
-    ImplClass operator -(const ImplClass &otherVector) const
+    ImplVector operator -(const ImplVector &otherVector) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v -= otherVector;
         return v;
     }
@@ -238,10 +246,9 @@ public:
      * \param otherVector
      * \return
      */
-    ImplClass operator *(const ImplClass &otherVector) const
+    ImplVector operator *(const ImplVector &otherVector) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v *= otherVector;
         return v;
     }
@@ -264,10 +271,9 @@ public:
      * \param factor
      * \return
      */
-    ImplClass operator *(double factor) const
+    ImplVector operator *(double factor) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v *= factor;
         return v;
     }
@@ -278,7 +284,7 @@ public:
      * \param otherVector
      * \return
      */
-    friend ImplClass operator *(double factor, const ImplClass &otherVector)
+    friend ImplVector operator *(double factor, const ImplVector &otherVector)
     {
         return otherVector * factor;
     }
@@ -301,10 +307,9 @@ public:
      * \param divisor
      * \return
      */
-    ImplClass operator /(double divisor) const
+    ImplVector operator /(double divisor) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v /= divisor;
         return v;
     }
@@ -327,10 +332,9 @@ public:
      * \param otherVector
      * \return
      */
-    ImplClass operator /(const ImplClass &otherVector) const
+    ImplVector operator /(const ImplVector &otherVector) const
     {
-        ImplClass v;
+        ImplVector v = this->clone();
-        v += (*this);
         v /= otherVector;
         return v;
     }
@@ -340,14 +344,14 @@ public:
      * \param otherVector
      * \return
      */
-    double dotProduct(const ImplClass &otherVector) const;
+    double dotProduct(const ImplVector &otherVector) const;
 
     /*!
      * \brief Cross product
      * \param otherVector
      * \return
      */
-    ImplClass crossProduct(const ImplClass &otherVector) const;
+    ImplVector crossProduct(const ImplVector &otherVector) const;
 
     /*!
      * \brief Matrix * this vector
@@ -360,12 +364,9 @@ public:
      * \brief Reciprocal value
      * \return
      */
-    ImplClass reciprocalValues() const
+    ImplVector reciprocalValues() const
     {
-        ImplClass v;
+        ImplVector v(1 / this->m_i, 1 / this->m_j, 1 / this->m_j);
-        v.m_i = (1 / this->m_i);
-        v.m_j = (1 / this->m_j);
-        v.m_k = (1 / this->m_j);
         return v;
     }
 
@@ -406,13 +407,13 @@ public:
      * \brief Round this vector
      * \return
      */
-    ImplClass &round()
+    ImplVector &round()
     {
         const double epsilon = 1E-10;
         this->m_i = BlackMisc::Math::CMath::roundEpsilon(this->m_i, epsilon);
         this->m_j = BlackMisc::Math::CMath::roundEpsilon(this->m_j, epsilon);
         this->m_k = BlackMisc::Math::CMath::roundEpsilon(this->m_k, epsilon);
-        return static_cast<ImplClass &>(*this);
+        return static_cast<ImplVector &>(*this);
     }
 };
 

src/blackmisc/pqphysicalquantity.cpp

@@ -1,4 +1,4 @@
-/*  Copyright (C) 2013 VATSIM Community
+/*  Copyright (C) 2013 VATSIM Community / contributors
  *  This Source Code Form is subject to the terms of the Mozilla Public
  *  License, v. 2.0. If a copy of the MPL was not distributed with this
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -190,8 +190,7 @@ template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, P
  */
 template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator -(const PQ &otherQuantity) const
 {
-    PQ minus;
+    PQ minus = this->clone();
-    minus += (*this);
     minus -= otherQuantity;
     return minus;
 }
@@ -210,8 +209,7 @@ template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, P
  */
 template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator *(double multiply) const
 {
-    PQ times;
+    PQ times = this->clone();
-    times += (*this);
     times *= multiply;
     return times;
 }
@@ -230,8 +228,7 @@ template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, P
  */
 template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator /(double divide) const
 {
-    PQ div;
+    PQ div = this->clone();
-    div += (*this);
     div /= divide;
     return div;
 }

src/blackmisc/pqphysicalquantity.h

@@ -36,7 +36,7 @@ protected:
     MU m_conversionSiUnit; //!< corresponding SI base unit
 
     /*!
-     * \brief Constructor with int
+     * \brief Constructor by integer
      * \param baseValue
      * \param unit
      * \param siConversionUnit
@@ -60,6 +60,15 @@ protected:
         return this->unitValueRoundedWithUnit(-1);
     }
 
+    /*!
+     * \brief Polymorphic clone as concrete class
+     * \return
+     */
+    PQ clone() const
+    {
+        return static_cast<PQ const &>(*this);
+    }
+
     /*!
      * \brief Init by integer
      * \param baseValue
@@ -72,6 +81,7 @@ protected:
      */
 
     void setUnitValue(double baseValue);
+
     /*!
      * \brief Set the SI value
      */