[hamradio-commits] [gnss-sdr] 52/80: Remove unused queue in input filters and data type adapters
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sun May 15 20:11:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch upstream
in repository gnss-sdr.
commit 953bc4686eb2c4a39a35b0f168f0745c040938a0
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon May 9 18:44:58 2016 +0200
Remove unused queue in input filters and data type adapters
---
.../data_type_adapter/adapters/byte_to_short.cc | 13 ++++---------
.../data_type_adapter/adapters/byte_to_short.h | 4 +---
.../data_type_adapter/adapters/ibyte_to_cbyte.cc | 6 ++----
.../data_type_adapter/adapters/ibyte_to_cbyte.h | 4 +---
.../data_type_adapter/adapters/ibyte_to_complex.cc | 13 ++++---------
.../data_type_adapter/adapters/ibyte_to_complex.h | 4 +---
.../data_type_adapter/adapters/ibyte_to_cshort.cc | 13 ++++---------
.../data_type_adapter/adapters/ibyte_to_cshort.h | 4 +---
.../data_type_adapter/adapters/ishort_to_complex.cc | 13 ++++---------
.../data_type_adapter/adapters/ishort_to_complex.h | 4 +---
.../data_type_adapter/adapters/ishort_to_cshort.cc | 13 ++++---------
.../data_type_adapter/adapters/ishort_to_cshort.h | 4 +---
src/algorithms/input_filter/adapters/fir_filter.cc | 5 ++---
src/algorithms/input_filter/adapters/fir_filter.h | 5 +----
.../input_filter/adapters/freq_xlating_fir_filter.cc | 5 ++---
.../input_filter/adapters/freq_xlating_fir_filter.h | 4 +---
src/core/receiver/gnss_block_factory.cc | 16 ++++++++--------
src/tests/gnss_block/fir_filter_test.cc | 18 +++++++++---------
..._e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 4 ++--
...ileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 4 ++--
..._pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 4 ++--
...ps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 6 +++---
...e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 4 ++--
...leo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 6 +++---
.../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 4 ++--
...l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc | 4 ++--
.../gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 4 ++--
...s_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 6 +++---
.../gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 4 ++--
29 files changed, 76 insertions(+), 122 deletions(-)
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
index b8eaf78..75df4f1 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
@@ -35,24 +35,20 @@
using google::LogMessage;
ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
-
std::string default_input_item_type = "byte";
std::string default_output_item_type = "short";
std::string default_dump_filename = "../data/input_filter.dat";
DLOG(INFO) << "role " << role_;
- input_item_type_ = config_->property(role_ + ".input_item_type",
- default_input_item_type);
+ input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
dump_ = config_->property(role_ + ".dump", false);
- dump_filename_ = config_->property(role_ + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
size_t item_size = sizeof(short);
@@ -65,7 +61,6 @@ ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
index a251092..ff241d5 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
@@ -34,7 +34,6 @@
#include <string>
#include <gnuradio/blocks/char_to_short.h>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
@@ -49,7 +48,7 @@ class ByteToShort: public GNSSBlockInterface
public:
ByteToShort(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~ByteToShort();
@@ -82,7 +81,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
index a17904d..8dc47c8 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
@@ -37,10 +37,9 @@
using google::LogMessage;
IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
std::string default_input_item_type = "byte";
std::string default_output_item_type = "lv_8sc_t";
@@ -64,7 +63,6 @@ IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, std::string ro
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
index 6430d3c..5eafe55 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
@@ -34,7 +34,6 @@
#include <string>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
#include "interleaved_byte_to_complex_byte.h"
@@ -50,7 +49,7 @@ class IbyteToCbyte : public GNSSBlockInterface
public:
IbyteToCbyte(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~IbyteToCbyte();
@@ -83,7 +82,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
index 77ac179..6119ebd 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
@@ -35,24 +35,20 @@
using google::LogMessage;
IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
-
std::string default_input_item_type = "byte";
std::string default_output_item_type = "gr_complex";
std::string default_dump_filename = "../data/input_filter.dat";
DLOG(INFO) << "role " << role_;
- input_item_type_ = config_->property(role_ + ".input_item_type",
- default_input_item_type);
+ input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
dump_ = config_->property(role_ + ".dump", false);
- dump_filename_ = config_->property(role_ + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
size_t item_size = sizeof(gr_complex);
@@ -65,7 +61,6 @@ IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, std::strin
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
index 5abe044..228e154 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
@@ -34,7 +34,6 @@
#include <string>
#include <gnuradio/blocks/interleaved_char_to_complex.h>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_synchro.h"
#include "gnss_block_interface.h"
@@ -50,7 +49,7 @@ class IbyteToComplex: public GNSSBlockInterface
public:
IbyteToComplex(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~IbyteToComplex();
@@ -83,7 +82,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
index 2934f14..206f824 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
@@ -37,24 +37,20 @@
using google::LogMessage;
IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
-
std::string default_input_item_type = "byte";
std::string default_output_item_type = "cshort";
std::string default_dump_filename = "../data/input_filter.dat";
DLOG(INFO) << "role " << role_;
- input_item_type_ = config_->property(role_ + ".input_item_type",
- default_input_item_type);
+ input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
dump_ = config_->property(role_ + ".dump", false);
- dump_filename_ = config_->property(role_ + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
size_t item_size = sizeof(lv_16sc_t);
@@ -67,7 +63,6 @@ IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, std::string
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
index 0d15a9b..a5a716a 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
@@ -33,7 +33,6 @@
#include <string>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
#include "interleaved_byte_to_complex_short.h"
@@ -50,7 +49,7 @@ class IbyteToCshort: public GNSSBlockInterface
public:
IbyteToCshort(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~IbyteToCshort();
@@ -83,7 +82,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
index 7b4fe83..e87dc1f 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
@@ -35,24 +35,20 @@
using google::LogMessage;
IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
-
std::string default_input_item_type = "short";
std::string default_output_item_type = "gr_complex";
std::string default_dump_filename = "../data/input_filter.dat";
DLOG(INFO) << "role " << role_;
- input_item_type_ = config_->property(role_ + ".input_item_type",
- default_input_item_type);
+ input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
dump_ = config_->property(role_ + ".dump", false);
- dump_filename_ = config_->property(role_ + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
size_t item_size = sizeof(gr_complex);
@@ -65,7 +61,6 @@ IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, std::str
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
index 23fe7e3..e12b23b 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
@@ -34,7 +34,6 @@
#include <string>
#include <gnuradio/blocks/interleaved_short_to_complex.h>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
@@ -49,7 +48,7 @@ class IshortToComplex: public GNSSBlockInterface
public:
IshortToComplex(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~IshortToComplex();
@@ -82,7 +81,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
index 9219775..503341d 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
@@ -37,24 +37,20 @@
using google::LogMessage;
IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
-
std::string default_input_item_type = "short";
std::string default_output_item_type = "cshort";
std::string default_dump_filename = "../data/input_filter.dat";
DLOG(INFO) << "role " << role_;
- input_item_type_ = config_->property(role_ + ".input_item_type",
- default_input_item_type);
+ input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
dump_ = config_->property(role_ + ".dump", false);
- dump_filename_ = config_->property(role_ + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
size_t item_size = sizeof(lv_16sc_t);
@@ -67,7 +63,6 @@ IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, std::strin
DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
-
}
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
index 05033c4..9cc5ae9 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
@@ -33,7 +33,6 @@
#include <string>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
#include "interleaved_short_to_complex_short.h"
@@ -50,7 +49,7 @@ class IshortToCshort: public GNSSBlockInterface
public:
IshortToCshort(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~IshortToCshort();
@@ -83,7 +82,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
};
diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc
index dd8bcfa..8112251 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/fir_filter.cc
@@ -39,10 +39,9 @@
using google::LogMessage;
FirFilter::FirFilter(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
size_t item_size;
(*this).init();
diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h
index c4025a1..958266c 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.h
+++ b/src/algorithms/input_filter/adapters/fir_filter.h
@@ -43,7 +43,6 @@
#include <gnuradio/blocks/float_to_short.h>
#include <gnuradio/filter/fir_filter_ccf.h>
#include <gnuradio/filter/fir_filter_fff.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
#include "complex_byte_to_float_x2.h"
#include "byte_x2_to_complex_byte.h"
@@ -67,8 +66,7 @@ public:
FirFilter(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
//! Destructor
virtual ~FirFilter();
@@ -103,7 +101,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
void init();
complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
index 65d8450..d5690f0 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
@@ -39,10 +39,9 @@
using google::LogMessage;
FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
+ unsigned int in_streams, unsigned int out_streams) :
config_(configuration), role_(role), in_streams_(in_streams),
- out_streams_(out_streams), queue_(queue)
+ out_streams_(out_streams)
{
size_t item_size;
(*this).init();
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
index 6ab31cb..caac52d 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
@@ -42,7 +42,6 @@
#include <gnuradio/blocks/complex_to_float.h>
#include <gnuradio/blocks/char_to_short.h>
#include <gnuradio/blocks/float_to_short.h>
-#include <gnuradio/msg_queue.h>
#include "gnss_block_interface.h"
#include "short_x2_to_cshort.h"
#include "complex_float_to_complex_byte.h"
@@ -66,7 +65,7 @@ class FreqXlatingFirFilter: public GNSSBlockInterface
public:
FreqXlatingFirFilter(ConfigurationInterface* configuration,
std::string role, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~FreqXlatingFirFilter();
std::string role()
@@ -105,7 +104,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
gr::blocks::file_sink::sptr file_sink_;
gr::blocks::complex_to_float::sptr complex_to_float_;
gr::blocks::char_to_short::sptr gr_char_to_short_;
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index c0d28ff..438238b 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -782,37 +782,37 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
else if (implementation.compare("Byte_To_Short") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new ByteToShort(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Ibyte_To_Cbyte") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new IbyteToCbyte(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Ibyte_To_Cshort") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new IbyteToCshort(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Ibyte_To_Complex") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new IbyteToComplex(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Ishort_To_Cshort") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new IshortToCshort(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Ishort_To_Complex") == 0)
{
std::unique_ptr<GNSSBlockInterface>block_(new IshortToComplex(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
@@ -820,13 +820,13 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
else if (implementation.compare("Fir_Filter") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new FirFilter(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Freq_Xlating_Fir_Filter") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new FreqXlatingFirFilter(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Beamformer_Filter") == 0)
diff --git a/src/tests/gnss_block/fir_filter_test.cc b/src/tests/gnss_block/fir_filter_test.cc
index 4ba9a06..9a90fa4 100644
--- a/src/tests/gnss_block/fir_filter_test.cc
+++ b/src/tests/gnss_block/fir_filter_test.cc
@@ -128,7 +128,7 @@ TEST_F(Fir_Filter_Test, Instantiate_gr_complex_gr_complex)
{
init();
configure_gr_complex_gr_complex();
- std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1, queue));
+ std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
int res = 0;
if (filter) res = 1;
ASSERT_EQ(1, res);
@@ -138,7 +138,7 @@ TEST_F(Fir_Filter_Test, Instantiate_cshort_cshort)
{
init();
configure_cshort_cshort();
- std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1, queue));
+ std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
int res = 0;
if (filter) res = 1;
ASSERT_EQ(1, res);
@@ -148,7 +148,7 @@ TEST_F(Fir_Filter_Test, Instantiate_cbyte_cbyte)
{
init();
configure_cbyte_cbyte();
- std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1, queue));
+ std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
int res = 0;
if (filter) res = 1;
ASSERT_EQ(1, res);
@@ -158,7 +158,7 @@ TEST_F(Fir_Filter_Test, Instantiate_cbyte_gr_complex)
{
init();
configure_cbyte_gr_complex();
- std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1, queue));
+ std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
int res = 0;
if (filter) res = 1;
ASSERT_EQ(1, res);
@@ -174,7 +174,7 @@ TEST_F(Fir_Filter_Test, ConnectAndRun)
init();
configure_gr_complex_gr_complex();
- std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1, queue);
+ std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1);
item_size = sizeof(gr_complex);
ASSERT_NO_THROW( {
filter->connect(top_block);
@@ -207,7 +207,7 @@ TEST_F(Fir_Filter_Test, ConnectAndRunGrcomplex)
init();
configure_gr_complex_gr_complex();
- std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1, queue);
+ std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1);
std::shared_ptr<InMemoryConfiguration> config2 = std::make_shared<InMemoryConfiguration>();
config2->set_property("Test_Source.samples", std::to_string(nsamples));
@@ -250,7 +250,7 @@ TEST_F(Fir_Filter_Test, ConnectAndRunCshorts)
init();
configure_cshort_cshort();
- std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1, queue);
+ std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1);
std::shared_ptr<InMemoryConfiguration> config2 = std::make_shared<InMemoryConfiguration>();
config2->set_property("Test_Source.samples", std::to_string(nsamples));
@@ -297,7 +297,7 @@ TEST_F(Fir_Filter_Test, ConnectAndRunCbytes)
init();
configure_cbyte_cbyte();
- std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1, queue);
+ std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1);
std::shared_ptr<InMemoryConfiguration> config2 = std::make_shared<InMemoryConfiguration>();
config2->set_property("Test_Source.samples", std::to_string(nsamples));
@@ -343,7 +343,7 @@ TEST_F(Fir_Filter_Test, ConnectAndRunCbyteGrcomplex)
init();
configure_cbyte_gr_complex();
- std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1, queue);
+ std::shared_ptr<FirFilter> filter = std::make_shared<FirFilter>(config.get(), "InputFilter", 1, 1);
std::shared_ptr<InMemoryConfiguration> config2 = std::make_shared<InMemoryConfiguration>();
config2->set_property("Test_Source.samples", std::to_string(nsamples));
diff --git a/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index a0a1cda..1e4a9d5 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -514,7 +514,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -602,7 +602,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProb
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 6cc6408..37b1da0 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -505,7 +505,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -591,7 +591,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabi
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index b9e49c1..983f908 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -498,7 +498,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -596,7 +596,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResultsProbabili
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index 2bce44c..924a124 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -634,7 +634,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -725,7 +725,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -811,7 +811,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 46e6cf2..958d848 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -498,7 +498,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -585,7 +585,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsPro
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index e89b62c..e34961b 100644
--- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -612,7 +612,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, SOURCEValidation)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
@@ -632,7 +632,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, SOURCEValidationTOFILE)
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
//signal_source->connect(top_block);
file_sink_=gr::blocks::file_sink::make(sizeof(gr_complex), filename_.c_str());
@@ -684,7 +684,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM)
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
filter->connect(top_block);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 07e85ca..202762e 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -497,7 +497,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -592,7 +592,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
index 5fea20e..229df95 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc
@@ -434,7 +434,7 @@ TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -516,7 +516,7 @@ TEST_F(GpsL1CaPcpsMultithreadAcquisitionGSoC2013Test, ValidationOfResultsProbabi
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
index 8864422..b66e54e 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
@@ -487,7 +487,7 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -569,7 +569,7 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResultsProbabilitie
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 5213864..e67d406 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -613,7 +613,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -709,7 +709,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsWithNoise
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -801,7 +801,7 @@ TEST_F(GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test, ValidationOfResultsProbabili
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index 3eb949b..cb7761b 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -491,7 +491,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResults)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
@@ -579,7 +579,7 @@ TEST_F(GpsL1CaPcpsTongAcquisitionGSoC2013Test, ValidationOfResultsProbabilities)
ASSERT_NO_THROW( {
boost::shared_ptr<GenSignalSource> signal_source;
SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue);
- FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1, queue);
+ FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1);
signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue));
signal_source->connect(top_block);
top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list