mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-29 15:30:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2017-07-11 00:10:37 +02:00
commit e8598e2dd7
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/tests/unit-tests/arithmetic/code_generation_test.cc
View File

@ -37,7 +37,7 @@
TEST(CodeGenGPSL1Test, CodeGeneration)
TEST(CodeGenerationTest, CodeGenGPSL1Test)
{
std::complex<float>* _dest = new std::complex<float>[1023];
signed int _prn = 1;
@ -58,7 +58,7 @@ TEST(CodeGenGPSL1Test, CodeGeneration)
long long int end = tv.tv_sec * 1000000 + tv.tv_usec;
ASSERT_LE(0, end - begin);
std::cout << "Generation completed in " << (end - begin) << " microseconds" << std::endl;
/* std::complex<float>* _dest2 = new std::complex<float>[1023];gettimeofday(&tv, NULL);
@ -83,7 +83,7 @@ TEST(CodeGenGPSL1Test, CodeGeneration)
TEST(CodeGenGPSL1SampledTest, CodeGeneration)
TEST(CodeGenerationTest, CodeGenGPSL1SampledTest)
{
signed int _prn = 1;
unsigned int _chip_shift = 4;
@ -132,7 +132,7 @@ TEST(CodeGenGPSL1SampledTest, CodeGeneration)
}
TEST(ComplexCarrierTest, CodeGeneration)
TEST(CodeGenerationTest, ComplexConjugateTest)
{
double _fs = 8000000;
double _f = 4000;
@ -154,29 +154,7 @@ TEST(ComplexCarrierTest, CodeGeneration)
gettimeofday(&tv, NULL);
long long int end = tv.tv_sec * 1000000 + tv.tv_usec;
delete[] _dest;
delete[] _dest;
ASSERT_LE(0, end - begin);
std::cout << "Carrier generation completed in " << (end - begin) << " microseconds" << std::endl;
/* std::complex<float>* _dest2 = new std::complex<float>[_samplesPerCode];
gettimeofday(&tv, NULL);
long long int begin2 = tv.tv_sec * 1000000 + tv.tv_usec;
for(int i = 0; i < iterations; i++)
{
complex_exp_gen_conj2( _dest2, _f, _fs, _samplesPerCode);
}
gettimeofday(&tv, NULL);
long long int end2 = tv.tv_sec * 1000000 + tv.tv_usec;
std::cout << "Carrier generation completed in " << (end2 - begin2) << " microseconds (New)" << std::endl;
for (int j=0; j<_samplesPerCode;j++)
{
if(std::abs(_dest[j] - _dest2[j]) > 0.1) std::cout << "Error!" << std::endl;
}
std::cout << _dest[10] << "and " << _dest2[10] << std::endl;
delete[] _dest2;*/
}

3
src/tests/unit-tests/control-plane/gnss_block_factory_test.cc
View File

@ -333,7 +333,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaPvt)
std::shared_ptr<GNSSBlockInterface> pvt_ = factory->GetPVT(configuration);
std::shared_ptr<PvtInterface> pvt = std::dynamic_pointer_cast<PvtInterface>(pvt_);
EXPECT_STREQ("PVT", pvt->role().c_str());
EXPECT_STREQ("Hybrid_PVT", pvt->implementation().c_str());
EXPECT_STREQ("RTKLIB_PVT", pvt->implementation().c_str());
}
@ -346,4 +346,3 @@ TEST(GNSSBlockFactoryTest, InstantiateWrongPvt)
std::shared_ptr<PvtInterface> pvt = std::dynamic_pointer_cast<PvtInterface>(pvt_);
EXPECT_EQ(nullptr, pvt);
}