style changes and removals of typeid

refs #81

src/blackmisc/mathmatrixbase.h

@@ -13,369 +13,345 @@
 
 namespace BlackMisc
 {
-namespace Math
-{
-
-/*!
- * \brief Base functionality of a matrix
- */
-template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public BlackMisc::CStreamable
-{
-private:
-    /*!
-     * \brief Easy access to derived class (CRTP template parameter)
-     * \return
-     */
-    ImplMatrix const *derived() const
+    namespace Math
     {
-        return static_cast<ImplMatrix const *>(this);
-    }
 
-    /*!
-     * \brief Easy access to derived class (CRTP template parameter)
-     * \return
-     */
-    ImplMatrix *derived()
-    {
-        return static_cast<ImplMatrix *>(this);
-    }
+        /*!
+         * \brief Base functionality of a matrix
+         */
+        template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public BlackMisc::CStreamable
+        {
+        private:
+            /*!
+             * \brief Easy access to derived class (CRTP template parameter)
+             * \return
+             */
+            ImplMatrix const *derived() const
+            {
+                return static_cast<ImplMatrix const *>(this);
+            }
 
-protected:
-    // no bug, Qt expects columns rows
-    QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
+            /*!
+             * \brief Easy access to derived class (CRTP template parameter)
+             * \return
+             */
+            ImplMatrix *derived()
+            {
+                return static_cast<ImplMatrix *>(this);
+            }
 
-    /*!
-     * \brief Conversion to string
-     * \param i18n
-     * \return
-     */
-    QString convertToQString(bool i18n = false) const;
+        protected:
+            // no bug, Qt expects columns rows
+            QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
 
-    /*!
-     * \brief Stream to DBus
-     * \param argument
-     */
-    virtual void marshallToDbus(QDBusArgument &argument) const
-    {
-        const QList<double> l = this->toList();
+            /*!
+             * \brief Conversion to string
+             * \param i18n
+             * \return
+             */
+            QString convertToQString(bool i18n = false) const;
 
-        // there is an issue with the signature of QList, so I use
-        // individual values
-        foreach(double v, l) {
-            argument << v;
-        }
-    }
+            /*!
+             * \brief Stream to DBus
+             * \param argument
+             */
+            virtual void marshallToDbus(QDBusArgument &argument) const;
 
-    /*!
-     * \brief Stream from DBus
-     * \param argument
-     */
-    virtual void unmarshallFromDbus(const QDBusArgument &argument)
-    {
-        QList<double> list;
-        double v;
-        while(!argument.atEnd()) {
-            argument >> v;
-            list.append(v);
-        }
-        this->fromList(list);
-    }
+            /*!
+             * \brief Stream from DBus
+             * \param argument
+             */
+            virtual void unmarshallFromDbus(const QDBusArgument &argument);
 
-public:
-    /*!
-     * \brief Default constructor
-     */
-    CMatrixBase() : m_matrix() {}
+        public:
+            /*!
+             * \brief Default constructor
+             */
+            CMatrixBase() : m_matrix() {}
 
-    /*!
-     * \brief Copy constructor
-     * \param other
-     */
-    CMatrixBase(const CMatrixBase &other) : m_matrix(other.m_matrix) {}
+            /*!
+             * \brief Fill with value
+             * \param fillValue
+             */
+            explicit CMatrixBase(double fillValue) : m_matrix()
+            {
+                this->fill(fillValue);
+            }
 
-    /*!
-     * \brief Fill with value
-     * \param fillValue
-     */
-    explicit CMatrixBase(double fillValue) : m_matrix()
-    {
-        this->fill(fillValue);
-    }
+            /*!
+             * \brief Virtual destructor
+             */
+            virtual ~CMatrixBase() {}
 
-    /*!
-     * \brief Virtual destructor
-     */
-    virtual ~CMatrixBase() {}
+            /*!
+             * \brief List of values
+             * \return
+             */
+            QList<double> toList() const;
 
-    /*!
-     * \brief List of values
-     * \return
-     */
-    QList<double> toList() const;
+            /*!
+             * \brief List of values
+             * \return
+             */
+            void fromList(const QList<double> &list);
 
-    /*!
-     * \brief List of values
-     * \return
-     */
-    void fromList(const QList<double> &list);
+            /*!
+             * \brief Equal operator ==
+             * \param other
+             * \return
+             */
+            bool operator ==(const ImplMatrix &other) const
+            {
+                if (this == &other) return true;
+                return this->m_matrix == other.m_matrix;
+            }
 
-    /*!
-     * \brief Equal operator ==
-     * \param other
-     * \return
-     */
-    bool operator ==(const ImplMatrix &other) const
-    {
-        if (this == &other) return true;
-        return this->m_matrix == other.m_matrix;
-    }
+            /*!
+             * \brief Unequal operator !=
+             * \param other
+             * \return
+             */
+            bool operator !=(const ImplMatrix &other) const
+            {
+                return !((*this) == other);
+            }
 
-    /*!
-     * \brief Unequal operator !=
-     * \param other
-     * \return
-     */
-    bool operator !=(const ImplMatrix &other) const
-    {
-        return !((*this) == other);
-    }
+            /*!
+             * \brief Operator *=
+             * \param factor
+             * \return
+             */
+            CMatrixBase &operator *=(double factor)
+            {
+                this->m_matrix *= factor;
+                return *this;
+            }
 
-    /*!
-     * \brief Operator *=
-     * \param factor
-     * \return
-     */
-    CMatrixBase &operator *=(double factor)
-    {
-        this->m_matrix *= factor;
-        return *this;
-    }
+            /*!
+             * \brief Operator *
+             * \param factor
+             * \return
+             */
+            ImplMatrix operator *(double factor) const
+            {
+                ImplMatrix m = *derived();
+                m *= factor;
+                return m;
+            }
 
-    /*!
-     * \brief Operator *
-     * \param factor
-     * \return
-     */
-    ImplMatrix operator *(double factor) const
-    {
-        ImplMatrix m = *derived();
-        m *= factor;
-        return m;
-    }
+            /*!
+             * \brief Operator to support commutative scalar multiplication
+             * \param factor
+             * \param other
+             * \return
+             */
+            friend ImplMatrix operator *(double factor, const ImplMatrix &other)
+            {
+                return other * factor;
+            }
 
-    /*!
-     * \brief Operator to support commutative scalar multiplication
-     * \param factor
-     * \param other
-     * \return
-     */
-    friend ImplMatrix operator *(double factor, const ImplMatrix &other)
-    {
-        return other * factor;
-    }
+            /*!
+             * \brief Operator /=
+             * \param factor
+             * \return
+             */
+            CMatrixBase &operator /=(double factor)
+            {
+                this->m_matrix /= factor;
+                return *this;
+            }
 
-    /*!
-     * \brief Operator /=
-     * \param factor
-     * \return
-     */
-    CMatrixBase &operator /=(double factor)
-    {
-        this->m_matrix /= factor;
-        return *this;
-    }
+            /*!
+             * \brief Operator /
+             * \param factor
+             * \return
+             */
+            ImplMatrix operator /(double factor) const
+            {
+                ImplMatrix m = *derived();
+                m /= factor;
+                return m;
+            }
 
-    /*!
-     * \brief Operator /
-     * \param factor
-     * \return
-     */
-    ImplMatrix operator /(double factor) const
-    {
-        ImplMatrix m = *derived();
-        m /= factor;
-        return m;
-    }
+            /*!
+             * \brief Operator +=
+             * \param other
+             * \return
+             */
+            CMatrixBase &operator +=(const CMatrixBase &other)
+            {
+                this->m_matrix += other.m_matrix;
+                return *this;
+            }
 
-    /*!
-     * \brief Operator +=
-     * \param other
-     * \return
-     */
-    CMatrixBase &operator +=(const CMatrixBase &other)
-    {
-        this->m_matrix += other.m_matrix;
-        return *this;
-    }
+            /*!
+             * \brief Operator +
+             * \param other
+             * \return
+             */
+            ImplMatrix operator +(const ImplMatrix &other) const
+            {
+                ImplMatrix m = *derived();
+                m += other;
+                return m;
+            }
 
-    /*!
-     * \brief Operator +
-     * \param other
-     * \return
-     */
-    ImplMatrix operator +(const ImplMatrix &other) const
-    {
-        ImplMatrix m = *derived();
-        m += other;
-        return m;
-    }
+            /*!
+             * \brief Operator -=
+             * \param other
+             * \return
+             */
+            CMatrixBase &operator -=(const CMatrixBase &other)
+            {
+                this->m_matrix -= other.m_matrix;
+                return *this;
+            }
 
-    /*!
-     * \brief Operator -=
-     * \param other
-     * \return
-     */
-    CMatrixBase &operator -=(const CMatrixBase &other)
-    {
-        this->m_matrix -= other.m_matrix;
-        return *this;
-    }
+            /*!
+             * \brief Operator -
+             * \param other
+             * \return
+             */
+            ImplMatrix operator -(const ImplMatrix &other) const
+            {
+                ImplMatrix m = *derived();
+                m -= other;
+                return m;
+            }
 
-    /*!
-     * \brief Operator -
-     * \param other
-     * \return
-     */
-    ImplMatrix operator -(const ImplMatrix &other) const
-    {
-        ImplMatrix m = *derived();
-        m -= other;
-        return m;
-    }
+            /*!
+             * \brief Is identity matrix?
+             * \return
+             */
+            bool isIdentity() const
+            {
+                return this->m_matrix.isIdentity();
+            }
 
-    /*!
-     * \brief Is identity matrix?
-     * \return
-     */
-    bool isIdentity() const
-    {
-        return this->m_matrix.isIdentity();
-    }
+            /*!
+             * \brief Is identity matrix? Epsilon considered.
+             * \return
+             */
+            bool isIdentityEpsilon() const
+            {
+                ImplMatrix m = *derived();
+                m.round();
+                return m.isIdentity();
+            }
 
-    /*!
-     * \brief Is identity matrix? Epsilon considered.
-     * \return
-     */
-    bool isIdentityEpsilon() const
-    {
-        ImplMatrix m = *derived();
-        m.round();
-        return m.isIdentity();
-    }
+            /*!
+             * \brief Set as identity matrix
+             * \return
+             */
+            void setToIdentity()
+            {
+                this->m_matrix.setToIdentity();
+            }
 
-    /*!
-     * \brief Set as identity matrix
-     * \return
-     */
-    void setToIdentity()
-    {
-        this->m_matrix.setToIdentity();
-    }
+            /*!
+             * \brief All values to zero
+             */
+            void setZero() { this->m_matrix.fill(0.0); }
 
-    /*!
-     * \brief All values to zero
-     */
-    void setZero() { this->m_matrix.fill(0.0); }
+            /*!
+             * \brief Is zero
+             * \return
+             */
+            bool isZero() const;
 
-    /*!
-     * \brief Is zero
-     * \return
-     */
-    bool isZero() const;
+            /*!
+             * \brief Each cell gets a unique index (used primarily for testing)
+             */
+            void setCellIndex();
 
-    /*!
-     * \brief Each cell gets a unique index (used primarily for testing)
-     */
-    void setCellIndex();
+            /*!
+             * \brief Is identity matrix? Epsilon considered.
+             * \return
+             */
+            bool isZeroEpsilon() const
+            {
+                ImplMatrix m = *derived();
+                m.round();
+                return m.isZero();
+            }
 
-    /*!
-     * \brief Is identity matrix? Epsilon considered.
-     * \return
-     */
-    bool isZeroEpsilon() const
-    {
-        ImplMatrix m = *derived();
-        m.round();
-        return m.isZero();
-    }
+            /*!
+             * \brief Set all elements the same
+             * \param value
+             */
+            void fill(double value) { this->m_matrix.fill(value); }
 
-    /*!
-     * \brief Set all elements the same
-     * \param value
-     */
-    void fill(double value) { this->m_matrix.fill(value); }
+            /*!
+             * \brief Round all values
+             */
+            void round();
 
-    /*!
-     * \brief Round all values
-     */
-    void round();
+            /*!
+             * \brief Return a rounded matrix
+             * \return
+             */
+            ImplMatrix roundedMatrix() const
+            {
+                ImplMatrix m = *derived();
+                m.round();
+                return m;
+            }
 
-    /*!
-     * \brief Return a rounded matrix
-     * \return
-     */
-    ImplMatrix roundedMatrix() const
-    {
-        ImplMatrix m = *derived();
-        m.round();
-        return m;
-    }
+            /*!
+             * \brief Get element
+             * \param row
+             * \param column
+             * \return
+             */
+            double getElement(size_t row, size_t column) const;
 
-    /*!
-     * \brief Get element
-     * \param row
-     * \param column
-     * \return
-     */
-    double getElement(size_t row, size_t column) const;
+            /*!
+             * \brief Get element
+             * \param row
+             * \param column
+             * \param value
+             */
+            void setElement(size_t row, size_t column, double value);
 
-    /*!
-     * \brief Get element
-     * \param row
-     * \param column
-     * \param value
-     */
-    void setElement(size_t row, size_t column, double value);
+            /*!
+             * \brief Get element by operator () modifying
+             * \param row
+             * \param column
+             * \return
+             */
+            double &operator()(size_t row, size_t column)
+            {
+                this->checkRange(row, column);
+                return this->m_matrix(row, column);
+            }
 
-    /*!
-     * \brief Get element by operator () modifying
-     * \param row
-     * \param column
-     * \return
-     */
-    double &operator()(size_t row, size_t column)
-    {
-        this->checkRange(row, column);
-        return this->m_matrix(row, column);
-    }
+            /*!
+             * \brief Get element by operator () read only
+             * \param row
+             * \param column
+             * \return
+             */
+            double operator()(size_t row, size_t column) const
+            {
+                return this->getElement(row, column);
+            }
 
-    /*!
-     * \brief Get element by operator () read only
-     * \param row
-     * \param column
-     * \return
-     */
-    double operator()(size_t row, size_t column) const
-    {
-        return this->getElement(row, column);
-    }
+            /*!
+             * \brief Register metadata
+             */
+            static void registerMetadata();
 
-    /*!
-     * \brief Register metadata
-     */
-    static void registerMetadata();
+        private:
+            /*!
+             * \brief Check range of row / column
+             * \param row
+             * \param column
+             * \throws std::range_error if index out of bounds
+             */
+            void checkRange(size_t row, size_t column) const;
+        };
 
-private:
-    /*!
-     * \brief Check range of row / column
-     * \param row
-     * \param column
-     * \throws std::range_error if index out of bounds
-     */
-    void checkRange(size_t row, size_t column) const;
-};
-
-} // namespace
+    } // namespace
 } // namespace
 
 #endif // guard