diff --git a/src/blah2.cpp b/src/blah2.cpp index 2af675a..0e7f34d 100644 --- a/src/blah2.cpp +++ b/src/blah2.cpp @@ -15,6 +15,7 @@ #include "process/detection/Interpolate.h" #include "process/spectrum/SpectrumAnalyser.h" #include "process/tracker/Tracker.h" +#include "data/meta/Constants.h" #include #include // optional header, provided for std:: interop @@ -193,8 +194,8 @@ int main(int argc, char **argv) tree["process"]["tracker"]["initiate"]["N"] >> n; tree["process"]["tracker"]["delete"] >> nDelete; tree["process"]["tracker"]["initiate"]["maxAcc"] >> maxAcc; - rangeRes = 299792458.0/fs; - lambda = 299792458.0/fc; + rangeRes = (double)Constants::c/fs; + lambda = (double)Constants::c/fc; Tracker *tracker = new Tracker(m, n, nDelete, ambiguity->cpi_length_seconds(), maxAcc, rangeRes, lambda); // setup process spectrum analyser diff --git a/src/data/Detection.cpp b/src/data/Detection.cpp index d49a751..ff33b16 100644 --- a/src/data/Detection.cpp +++ b/src/data/Detection.cpp @@ -1,4 +1,5 @@ #include "Detection.h" +#include "data/meta/Constants.h" #include #include #include @@ -93,7 +94,7 @@ std::string Detection::delay_bin_to_km(std::string json, uint32_t fs) document["delay"].Clear(); for (int i = 0; i < delay.size(); i++) { - document["delay"].PushBack(1.0*delay[i]*(299792458/(double)fs)/1000, allocator); + document["delay"].PushBack(1.0*delay[i]*(Constants::c/(double)fs)/1000, allocator); } rapidjson::StringBuffer strbuf; diff --git a/src/data/Map.cpp b/src/data/Map.cpp index 0c9ddfe..9ec3290 100644 --- a/src/data/Map.cpp +++ b/src/data/Map.cpp @@ -1,4 +1,5 @@ #include "Map.h" +#include "data/meta/Constants.h" #include #include #include @@ -172,7 +173,7 @@ std::string Map::delay_bin_to_km(std::string json, uint32_t fs) document["delay"].Clear(); for (int i = 0; i < delay.size(); i++) { - document["delay"].PushBack(1.0*delay[i]*(299792458/(double)fs)/1000, allocator); + document["delay"].PushBack(1.0*delay[i]*(Constants::c/(double)fs)/1000, allocator); } rapidjson::StringBuffer strbuf; diff --git a/src/data/meta/Constants.h b/src/data/meta/Constants.h new file mode 100644 index 0000000..8a736dd --- /dev/null +++ b/src/data/meta/Constants.h @@ -0,0 +1,11 @@ +#ifndef CONSTANTS_H +#define CONSTANTS_H + +#include + +namespace Constants +{ + const uint32_t c = 299792458; +} + +#endif \ No newline at end of file diff --git a/test/unit/process/tracker/TestTracker.cpp b/test/unit/process/tracker/TestTracker.cpp index f0e86bf..13c27d9 100644 --- a/test/unit/process/tracker/TestTracker.cpp +++ b/test/unit/process/tracker/TestTracker.cpp @@ -8,6 +8,7 @@ #include "data/Detection.h" #include "data/Track.h" #include "process/tracker/Tracker.h" +#include "data/meta/Constants.h" #include #include @@ -24,9 +25,9 @@ TEST_CASE("Constructor", "[constructor]") double cpi = 1; double maxAccInit = 10; double fs = 2000000; - double rangeRes = 299792458.0/fs; + double rangeRes = (double)Constants::c/fs; double fc = 204640000; - double lambda = 299792458.0/fc; + double lambda = (double)Constants::c/fc; Tracker tracker = Tracker(m, n, nDelete, cpi, maxAccInit, rangeRes, lambda); } @@ -40,9 +41,9 @@ TEST_CASE("Process ACTIVE track constant acc", "[process]") double cpi = 1; double maxAccInit = 10; double fs = 2000000; - double rangeRes = 299792458.0/fs; + double rangeRes = (double)Constants::c/fs; double fc = 204640000; - double lambda = 299792458.0/fc; + double lambda = (double)Constants::c/fc; Tracker tracker = Tracker(m, n, nDelete, cpi, maxAccInit, rangeRes, lambda); @@ -64,9 +65,9 @@ TEST_CASE("Test predict", "[predict]") double cpi = 1; double maxAccInit = 10; double fs = 2000000; - double rangeRes = 299792458.0/fs; + double rangeRes = (double)Constants::c/fs; double fc = 204640000; - double lambda = 299792458.0/fc; + double lambda = (double)Constants::c/fc; Tracker tracker = Tracker(m, n, nDelete, cpi, maxAccInit, rangeRes, lambda);