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


Ignore:
Timestamp:
Jul 3, 2019, 5:05:33 PM (2 years ago)
Author:
Sanahuja Guillaume
Message:
Location:
trunk/lib/FlairFilter/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

    r223 r318  
    3939                             " Hz", 0, 10000, 0.1, 2, 1);
    4040
    41   cvmatrix_descriptor *desc = new cvmatrix_descriptor(nbRow, nbCol);
     41  MatrixDescriptor *desc = new MatrixDescriptor(nbRow, nbCol);
    4242  //desc->SetElementName(0, 0, "output");
    4343  output = new Matrix(self, desc, floatType, name);
  • trunk/lib/FlairFilter/src/ControlLaw.cpp

    r214 r318  
    1818#include "ControlLaw.h"
    1919#include <Matrix.h>
    20 #include <cvmatrix_descriptor.h>
     20#include <MatrixDescriptor.h>
    2121#include <DataPlot1D.h>
    2222#include <sstream>
     
    3434    output = new Matrix(this, nb_out, 1, floatType, name);
    3535  } else {
    36     cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_out, 1);
     36    MatrixDescriptor *desc = new MatrixDescriptor(nb_out, 1);
    3737    for (int i = 0; i < nb_out; i++) {
    3838      std::stringstream ss;
  • trunk/lib/FlairFilter/src/EulerDerivative_impl.cpp

    r272 r318  
    3737  if (init_value != NULL) {
    3838    // init output matrix of same size as init
    39     cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
     39    MatrixDescriptor *desc =new MatrixDescriptor(init_value->Rows(), init_value->Cols());
    4040
    4141    for (int i = 0; i < init_value->Rows(); i++) {
     
    5353  } else {
    5454    // if NULL, assume dimension 1, and init=0
    55     cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
     55    MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
    5656    desc->SetElementName(0, 0, "output");
    5757    output = new Matrix(self, desc, floatType, name);
     
    6060 
    6161 
    62   cvmatrix_descriptor *desc = new cvmatrix_descriptor(output->Rows(), output->Cols());
     62  MatrixDescriptor *desc = new MatrixDescriptor(output->Rows(), output->Cols());
    6363  prev_input = new Matrix(self, desc, output->GetDataType().GetElementDataType(), name);
    6464  prev_output = new Matrix(self, desc, output->GetDataType().GetElementDataType(), name);
  • trunk/lib/FlairFilter/src/JoyReference_impl.cpp

    r223 r318  
    4242  input = new Matrix(self, 4, 1, floatType, name);
    4343
    44   cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 1);
     44  MatrixDescriptor *desc = new MatrixDescriptor(4, 1);
    4545  desc->SetElementName(0, 0, "z");
    4646  ;
  • trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp

    r223 r318  
    3838  if (init_value != NULL) {
    3939    // init output matrix of same size as init
    40     cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
     40    MatrixDescriptor *desc =new MatrixDescriptor(init_value->Rows(), init_value->Cols());
    4141
    4242    for (int i = 0; i < init_value->Rows(); i++) {
     
    5454  } else {
    5555    // if NULL, assume dimension 1, and init=0
    56     cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
     56    MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
    5757    desc->SetElementName(0, 0, "output");
    5858    output = new Matrix(self, desc, floatType, name);
  • trunk/lib/FlairFilter/src/PidThrust_impl.cpp

    r223 r318  
    3838  self->input = new Matrix(self, 2, 1, floatType, name);
    3939
    40   cvmatrix_descriptor *desc = new cvmatrix_descriptor(5, 1);
     40  MatrixDescriptor *desc = new MatrixDescriptor(5, 1);
    4141  desc->SetElementName(0, 0, "p");
    4242  desc->SetElementName(1, 0, "i");
  • trunk/lib/FlairFilter/src/Pid_impl.cpp

    r223 r318  
    3636  self->input = new Matrix(self, 2, 1, floatType, name);
    3737
    38   cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 1);
     38  MatrixDescriptor *desc = new MatrixDescriptor(4, 1);
    3939  desc->SetElementName(0, 0, "p");
    4040  desc->SetElementName(1, 0, "i");
  • trunk/lib/FlairFilter/src/TrajectoryGenerator1D_impl.cpp

    r214 r318  
    6060
    6161  // init matrix
    62   cvmatrix_descriptor *desc = new cvmatrix_descriptor(2, 1);
     62  MatrixDescriptor *desc = new MatrixDescriptor(2, 1);
    6363  desc->SetElementName(0, 0, "pos");
    6464  desc->SetElementName(1, 0, "vel");
  • trunk/lib/FlairFilter/src/TrajectoryGenerator2DCircle_impl.cpp

    r214 r318  
    5151
    5252  // init matrix
    53   cvmatrix_descriptor *desc = new cvmatrix_descriptor(2, 2);
     53  MatrixDescriptor *desc = new MatrixDescriptor(2, 2);
    5454  desc->SetElementName(0, 0, "pos.x");
    5555  desc->SetElementName(0, 1, "pos.y");
  • trunk/lib/FlairFilter/src/X4X8Multiplex_impl.cpp

    r214 r318  
    5050  pas->AddItem("clockwise");
    5151
    52   cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_mot, 1);
     52  MatrixDescriptor *desc = new MatrixDescriptor(nb_mot, 1);
    5353  for (int i = 0; i < nb_mot; i++) {
    5454    desc->SetElementName(i, 0, MotorName(i));
  • trunk/lib/FlairFilter/src/unexported/NestedSat_impl.h

    r15 r318  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
    2120class io_data;
    2221}
Note: See TracChangeset for help on using the changeset viewer.