mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-05-01 03:01:24 +00:00
Code Issues Releases Wiki Activity

Rational_Resampler renamed to Mmse_Resampler

Browse Source 
Following its renaming in GNU Radio 3.8 (see https://github.com/gnuradio/gnuradio/issues/1428)
This commit is contained in:
Carles Fernandez
2018-02-03 10:49:03 +01:00
parent 199b1a9cff
commit 891d6b80df
8 changed files with 150 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/resampler/adapters/CMakeLists.txt
View File

@@ -18,7 +18,7 @@
set(RESAMPLER_ADAPTER_SOURCES
direct_resampler_conditioner.cc
fractional_resampler_conditioner.cc
mmse_resampler_conditioner.cc
)
include_directories(

18
src/algorithms/resampler/adapters/fractional_resampler_conditioner.cc → src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
View File

@@ -1,6 +1,6 @@
/*!
* \file fractional_resampler_conditioner.cc
* \brief Implementation of an adapter of a fractional resampler conditioner block
* \file mmse_resampler_conditioner.cc
* \brief Implementation of an adapter of a MMSE resampler conditioner block
* to a SignalConditionerInterface
* \author Antonio Ramos, 2018. antonio.ramos(at)cttc.es
*
@@ -29,7 +29,7 @@
* -------------------------------------------------------------------------
*/
#include "fractional_resampler_conditioner.h"
#include "mmse_resampler_conditioner.h"
#include <cmath>
#include <limits>
#include <glog/logging.h>
@@ -38,7 +38,7 @@
using google::LogMessage;
FractionalResamplerConditioner::FractionalResamplerConditioner(
MmseResamplerConditioner::MmseResamplerConditioner(
ConfigurationInterface* configuration, std::string role,
unsigned int in_stream, unsigned int out_stream) :
role_(role), in_stream_(in_stream), out_stream_(out_stream)
@@ -89,11 +89,11 @@ FractionalResamplerConditioner::FractionalResamplerConditioner(
}
FractionalResamplerConditioner::~FractionalResamplerConditioner() {}
MmseResamplerConditioner::~MmseResamplerConditioner() {}
void FractionalResamplerConditioner::connect(gr::top_block_sptr top_block)
void MmseResamplerConditioner::connect(gr::top_block_sptr top_block)
{
if (dump_)
{
@@ -107,7 +107,7 @@ void FractionalResamplerConditioner::connect(gr::top_block_sptr top_block)
}
void FractionalResamplerConditioner::disconnect(gr::top_block_sptr top_block)
void MmseResamplerConditioner::disconnect(gr::top_block_sptr top_block)
{
if (dump_)
{
@@ -116,13 +116,13 @@ void FractionalResamplerConditioner::disconnect(gr::top_block_sptr top_block)
}
gr::basic_block_sptr FractionalResamplerConditioner::get_left_block()
gr::basic_block_sptr MmseResamplerConditioner::get_left_block()
{
return resampler_;
}
gr::basic_block_sptr FractionalResamplerConditioner::get_right_block()
gr::basic_block_sptr MmseResamplerConditioner::get_right_block()
{
return resampler_;
}

18
src/algorithms/resampler/adapters/fractional_resampler_conditioner.h → src/algorithms/resampler/adapters/mmse_resampler_conditioner.h
View File

@@ -1,6 +1,6 @@
/*!
* \file fractional_resampler_conditioner.h
* \brief Interface of an adapter of a fractional resampler conditioner block
* \file mmse_resampler_conditioner.h
* \brief Interface of an adapter of a mmse resampler conditioner block
* to a SignalConditionerInterface
* \author Antonio Ramos, 2018. antonio.ramos(at)cttc.es
*
@@ -30,8 +30,8 @@
*/
#ifndef GNSS_SDR_FRACTIONAL_RESAMPLER_CONDITIONER_H_
#define GNSS_SDR_FRACTIONAL_RESAMPLER_CONDITIONER_H_
#ifndef GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_
#define GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_
#include <string>
#ifdef GR_GREATER_38
@@ -44,17 +44,17 @@
class ConfigurationInterface;
/*!
* \brief Interface of an adapter of a fractional resampler conditioner block
* \brief Interface of a MMSE resampler block adapter
* to a SignalConditionerInterface
*/
class FractionalResamplerConditioner: public GNSSBlockInterface
class MmseResamplerConditioner: public GNSSBlockInterface
{
public:
FractionalResamplerConditioner(ConfigurationInterface* configuration,
MmseResamplerConditioner(ConfigurationInterface* configuration,
std::string role, unsigned int in_stream,
unsigned int out_stream);
virtual ~FractionalResamplerConditioner();
virtual ~MmseResamplerConditioner();
inline std::string role() override
{
@@ -63,7 +63,7 @@ public:
inline std::string implementation() override
{
return "Fractional_Resampler";
return "Mmse_Resampler";
}
inline size_t item_size() override