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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

• completely removed cvmatrix
• replaced cvmatrix_descriptor by MatrixDescriptor

Location:

trunk/lib/FlairFilter/src

Files:

• ButterworthLowPass_impl.cpp (modified) (1 diff)
• ControlLaw.cpp (modified) (2 diffs)
• EulerDerivative_impl.cpp (modified) (3 diffs)
• JoyReference_impl.cpp (modified) (1 diff)
• LowPassFilter_impl.cpp (modified) (2 diffs)
• PidThrust_impl.cpp (modified) (1 diff)
• Pid_impl.cpp (modified) (1 diff)
• TrajectoryGenerator1D_impl.cpp (modified) (1 diff)
• TrajectoryGenerator2DCircle_impl.cpp (modified) (1 diff)
• X4X8Multiplex_impl.cpp (modified) (1 diff)
• unexported/NestedSat_impl.h (modified) (1 diff)

trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

@@ -39 +39 @@
                              " Hz", 0, 10000, 0.1, 2, 1);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(nbRow, nbCol);
+  MatrixDescriptor *desc = new MatrixDescriptor(nbRow, nbCol);
   //desc->SetElementName(0, 0, "output");
   output = new Matrix(self, desc, floatType, name);

trunk/lib/FlairFilter/src/ControlLaw.cpp

@@ -18 +18 @@
 #include "ControlLaw.h"
 #include <Matrix.h>
-#include <cvmatrix_descriptor.h>
+#include <MatrixDescriptor.h>
 #include <DataPlot1D.h>
 #include <sstream>
@@ -34 +34 @@
     output = new Matrix(this, nb_out, 1, floatType, name);
   } else {
-    cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_out, 1);
+    MatrixDescriptor *desc = new MatrixDescriptor(nb_out, 1);
     for (int i = 0; i < nb_out; i++) {
       std::stringstream ss;

trunk/lib/FlairFilter/src/EulerDerivative_impl.cpp

@@ -37 +37 @@
   if (init_value != NULL) {
     // init output matrix of same size as init
-    cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
+    MatrixDescriptor *desc =new MatrixDescriptor(init_value->Rows(), init_value->Cols());
 
     for (int i = 0; i < init_value->Rows(); i++) {
@@ -53 +53 @@
   } else {
     // if NULL, assume dimension 1, and init=0
-    cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+    MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
     desc->SetElementName(0, 0, "output");
     output = new Matrix(self, desc, floatType, name);
@@ -60 +60 @@
   
  
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(output->Rows(), output->Cols());
+  MatrixDescriptor *desc = new MatrixDescriptor(output->Rows(), output->Cols());
   prev_input = new Matrix(self, desc, output->GetDataType().GetElementDataType(), name);
   prev_output = new Matrix(self, desc, output->GetDataType().GetElementDataType(), name);

trunk/lib/FlairFilter/src/JoyReference_impl.cpp

@@ -42 +42 @@
   input = new Matrix(self, 4, 1, floatType, name);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(4, 1);
   desc->SetElementName(0, 0, "z");
   ;

trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp

@@ -38 +38 @@
   if (init_value != NULL) {
     // init output matrix of same size as init
-    cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
+    MatrixDescriptor *desc =new MatrixDescriptor(init_value->Rows(), init_value->Cols());
 
     for (int i = 0; i < init_value->Rows(); i++) {
@@ -54 +54 @@
   } else {
     // if NULL, assume dimension 1, and init=0
-    cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+    MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
     desc->SetElementName(0, 0, "output");
     output = new Matrix(self, desc, floatType, name);

trunk/lib/FlairFilter/src/PidThrust_impl.cpp

@@ -38 +38 @@
   self->input = new Matrix(self, 2, 1, floatType, name);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(5, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(5, 1);
   desc->SetElementName(0, 0, "p");
   desc->SetElementName(1, 0, "i");

trunk/lib/FlairFilter/src/Pid_impl.cpp

@@ -36 +36 @@
   self->input = new Matrix(self, 2, 1, floatType, name);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(4, 1);
   desc->SetElementName(0, 0, "p");
   desc->SetElementName(1, 0, "i");

trunk/lib/FlairFilter/src/TrajectoryGenerator1D_impl.cpp

@@ -60 +60 @@
 
   // init matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(2, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(2, 1);
   desc->SetElementName(0, 0, "pos");
   desc->SetElementName(1, 0, "vel");

trunk/lib/FlairFilter/src/TrajectoryGenerator2DCircle_impl.cpp

@@ -51 +51 @@
 
   // init matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(2, 2);
+  MatrixDescriptor *desc = new MatrixDescriptor(2, 2);
   desc->SetElementName(0, 0, "pos.x");
   desc->SetElementName(0, 1, "pos.y");

trunk/lib/FlairFilter/src/X4X8Multiplex_impl.cpp

@@ -50 +50 @@
   pas->AddItem("clockwise");
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_mot, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(nb_mot, 1);
   for (int i = 0; i < nb_mot; i++) {
     desc->SetElementName(i, 0, MotorName(i));

trunk/lib/FlairFilter/src/unexported/NestedSat_impl.h

@@ -18 +18 @@
 namespace flair {
 namespace core {
-class cvmatrix;
 class io_data;
 }