Changeset 318 in flair-src for trunk/lib/FlairCore

Timestamp:

Jul 3, 2019, 5:05:33 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

• completely removed cvmatrix
• replaced cvmatrix_descriptor by MatrixDescriptor

Location:

trunk/lib/FlairCore/src

Files:

• Matrix.cpp (modified) (1 diff)
• Matrix.h (modified) (4 diffs)
• MatrixDescriptor.cpp (moved) (moved from trunk/lib/FlairCore/src/cvmatrix_descriptor.cpp ) (7 diffs)
• MatrixDescriptor.h (moved) (moved from trunk/lib/FlairCore/src/cvmatrix_descriptor.h ) (6 diffs)
• Matrix_impl.cpp (modified) (1 diff)
• cvmatrix.cpp (deleted)
• cvmatrix.h (deleted)
• cvmatrix_impl.cpp (deleted)
• unexported/Matrix_impl.h (modified) (1 diff)
• unexported/cvmatrix_impl.h (deleted)

trunk/lib/FlairCore/src/Matrix.cpp

@@ -107 +107 @@
 }
 
-Matrix::Matrix(const Object *parent, const cvmatrix_descriptor *descriptor,
+Matrix::Matrix(const Object *parent, const MatrixDescriptor *descriptor,
                    ScalarType const &elementDataType, string name, uint32_t n)
     : io_data(parent, name, n),

trunk/lib/FlairCore/src/Matrix.h

@@ -16 +16 @@
 #include <io_data.h>
 #include <IODataElement.h>
-#include <cvmatrix_descriptor.h>
+#include <MatrixDescriptor.h>
 
 class Matrix_impl;
@@ -52 +52 @@
   *
   * Construct an io_data representing a matrix. \n
-  * It uses a cvmatrix_descriptor to get size and elements' names. \n
+  * It uses a MatrixDescriptor to get size and elements' names. \n
   * Names are used for graphs and logs. \n
   * All values are initialized to 0.
@@ -62 +62 @@
   * \param n number of samples
   */
-  Matrix(const Object *parent, const cvmatrix_descriptor *descriptor,
+  Matrix(const Object *parent, const MatrixDescriptor *descriptor,
            ScalarType const &elementDataType, std::string name = "",
            uint32_t n = 1);
@@ -145 +145 @@
   * \brief Element name
   *
-  * If Matrix was created without cvmatrix_descriptor, element name is empty.
+  * If Matrix was created without MatrixDescriptor, element name is empty.
   *
   * \param row element row

trunk/lib/FlairCore/src/MatrixDescriptor.cpp

@@ -4 +4 @@
 // %flair:license}
 //  created:    2014/02/05
-//  filename:   cvmatrix_descriptor.cpp
+//  filename:   MatrixDescriptor.cpp
 //
 //  author:     Guillaume Sanahuja
@@ -11 +11 @@
 //  version:    $Id: $
 //
-//  purpose:    Class describing cvmatrix elements, for log and graphs purpose
+//  purpose:    Class describing matrix elements, for log and graphs purpose
 //
 /*********************************************************************/
 
-#include "cvmatrix_descriptor.h"
+#include "MatrixDescriptor.h"
 #include "FrameworkManager.h"
 
@@ -23 +23 @@
 namespace core {
 
-cvmatrix_descriptor::cvmatrix_descriptor(uint32_t rows, uint32_t cols) {
+MatrixDescriptor::MatrixDescriptor(uint32_t rows, uint32_t cols) {
   this->rows = rows;
   this->cols = cols;
@@ -36 +36 @@
 }
 
-cvmatrix_descriptor::~cvmatrix_descriptor() {
+MatrixDescriptor::~MatrixDescriptor() {
   for (uint32_t i = 0; i < rows * cols; i++) {
     delete element_names[i];
@@ -43 +43 @@
 }
 
-void cvmatrix_descriptor::SetElementName(uint32_t row, uint32_t col,
+void MatrixDescriptor::SetElementName(uint32_t row, uint32_t col,
                                          string name) {
   if (row >= rows || col >= cols) {
@@ -53 +53 @@
 }
 
-string cvmatrix_descriptor::ElementName(uint32_t row, uint32_t col) const {
+string MatrixDescriptor::ElementName(uint32_t row, uint32_t col) const {
   if (row >= rows || col >= cols) {
     getFrameworkManager()->Err("index out of bound (%i,%i), max (%i,%i)\n",
@@ -62 +62 @@
 }
 
-uint32_t cvmatrix_descriptor::Rows() const { return rows; }
+uint32_t MatrixDescriptor::Rows() const { return rows; }
 
-uint32_t cvmatrix_descriptor::Cols() const { return cols; }
+uint32_t MatrixDescriptor::Cols() const { return cols; }
 
 } // end namespace core

trunk/lib/FlairCore/src/MatrixDescriptor.h

@@ -4 +4 @@
 // %flair:license}
 /*!
- * \file cvmatrix_descriptor.h
- * \brief Class describing cvmatrix elements, for log and graphs purpose
+ * \file MatrixDescriptor.h
+ * \brief Class describing matrix elements, for log and graphs purpose
  * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253
  * \date 2014/02/05
@@ -11 +11 @@
  */
 
-#ifndef CVMATRIX_DESCRIPTOR_H
-#define CVMATRIX_DESCRIPTOR_H
+#ifndef MATRIXDESCRIPTOR_H
+#define MATRIXDESCRIPTOR_H
 
 #include <string>
@@ -19 +19 @@
 namespace core {
 
-/*! \class cvmatrix_descriptor
+/*! \class MatrixDescriptor
 *
-* \brief Class describing cvmatrix elements, for log and graphs purpose
+* \brief Class describing matrix elements, for log and graphs purpose
 *
 * This class allows to give a name to matrix elements. These names
 * will be used in graphs and logs.
 */
-class cvmatrix_descriptor {
+class MatrixDescriptor {
 public:
   /*!
@@ -36 +36 @@
   * \param cols matrix cols
   */
-  cvmatrix_descriptor(uint32_t rows, uint32_t cols);
+  MatrixDescriptor(uint32_t rows, uint32_t cols);
 
   /*!
@@ -42 +42 @@
   *
   */
-  ~cvmatrix_descriptor();
+  ~MatrixDescriptor();
 
   /*!
@@ -85 +85 @@
 } // end namespace flair
 
-#endif // CVMATRIX_DESCRIPTOR_H
+#endif // MATRIXDESCRIPTOR_H

trunk/lib/FlairCore/src/Matrix_impl.cpp

@@ -27 +27 @@
                              int n)
     : elementDataType(_elementDataType) {
-  descriptor = new cvmatrix_descriptor(rows, cols);
+  descriptor = new MatrixDescriptor(rows, cols);
   Init(self, n);
 }
 
 Matrix_impl::Matrix_impl(Matrix *self,
-                             const cvmatrix_descriptor *inDescriptor,
+                             const MatrixDescriptor *inDescriptor,
                              flair::core::ScalarType const &_elementDataType,
                              int n)
     : elementDataType(_elementDataType) {
-  descriptor = new cvmatrix_descriptor(inDescriptor->Rows(), inDescriptor->Cols());
+  descriptor = new MatrixDescriptor(inDescriptor->Rows(), inDescriptor->Cols());
 
   for (uint32_t i = 0; i < descriptor->Rows(); i++) {

trunk/lib/FlairCore/src/unexported/Matrix_impl.h

@@ -27 +27 @@
                 flair::core::ScalarType const &elementDataType, int n);
   Matrix_impl(flair::core::Matrix *self,
-                const flair::core::cvmatrix_descriptor *descriptor,
+                const flair::core::MatrixDescriptor *descriptor,
                 flair::core::ScalarType const &elementDataType, int n);
   ~Matrix_impl();
 
   flair::core::ScalarType const &elementDataType;
-  flair::core::cvmatrix_descriptor *descriptor;
+  flair::core::MatrixDescriptor *descriptor;
   void *datas;
   void SetValueNoMutex(uint32_t row, uint32_t col, float value);