From d82ad6e30f923a476386be7acfffe746c57fac3d Mon Sep 17 00:00:00 2001
From: PepMS <jmarti@iri.upc.edu>
Date: Fri, 3 Apr 2020 15:13:59 +0200
Subject: [PATCH] [renaming] GNSSUtils - > GnssUtils
---
include/gnss_utils/TDCP.h | 4 ++--
include/gnss_utils/navigation.h | 4 ++--
include/gnss_utils/observations.h | 4 ++--
include/gnss_utils/ublox_raw.h | 8 ++++----
include/gnss_utils/utils/rcv_position.h | 4 ++--
include/gnss_utils/utils/sat_position.h | 4 ++--
include/gnss_utils/utils/transformations.h | 4 ++--
include/gnss_utils/utils/utils.h | 6 +++---
src/TDCP.cpp | 4 ++--
src/examples/gnss_utils_test.cpp | 2 +-
src/navigation.cpp | 2 +-
src/observations.cpp | 4 ++--
src/ublox_raw.cpp | 2 +-
src/utils/rcv_position.cpp | 18 +++++++++---------
src/utils/sat_position.cpp | 6 +++---
src/utils/transformations.cpp | 8 ++++----
src/utils/utils.cpp | 4 ++--
test/gtest_observations.cpp | 4 ++--
test/gtest_transformations.cpp | 2 +-
19 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/include/gnss_utils/TDCP.h b/include/gnss_utils/TDCP.h
index 00f70f0..ab8330c 100644
--- a/include/gnss_utils/TDCP.h
+++ b/include/gnss_utils/TDCP.h
@@ -16,7 +16,7 @@
#include "gnss_utils/observations.h"
#include "gnss_utils/navigation.h"
-namespace GNSSUtils
+namespace GnssUtils
{
struct TDCPParams
{
@@ -81,6 +81,6 @@ void filterCommonSatellites(Observations& common_obs_r,
const TDCPParams& sd_params,
const prcopt_t& opt);
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif /* INCLUDE_GNSS_UTILS_TDCP_H_ */
diff --git a/include/gnss_utils/navigation.h b/include/gnss_utils/navigation.h
index 20f65a0..beb7299 100644
--- a/include/gnss_utils/navigation.h
+++ b/include/gnss_utils/navigation.h
@@ -9,7 +9,7 @@ extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
class Navigation;
typedef std::shared_ptr<Navigation> NavigationPtr;
@@ -361,5 +361,5 @@ inline void Navigation::freeNavArrays(nav_t& nav)
freeFcb(nav);
}
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif
diff --git a/include/gnss_utils/observations.h b/include/gnss_utils/observations.h
index 7fb34ba..fd4a921 100644
--- a/include/gnss_utils/observations.h
+++ b/include/gnss_utils/observations.h
@@ -13,7 +13,7 @@ extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
class Observations;
typedef std::shared_ptr<Observations> ObservationsPtr;
@@ -131,5 +131,5 @@ inline bool Observations::hasSatellite(const unsigned char& i) const
return sat_2_idx_.count(i) != 0;
}
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif // INCLUDE_GNSS_UTILS_OBSERVATIONS_H_
diff --git a/include/gnss_utils/ublox_raw.h b/include/gnss_utils/ublox_raw.h
index 1c36ba2..b860abf 100644
--- a/include/gnss_utils/ublox_raw.h
+++ b/include/gnss_utils/ublox_raw.h
@@ -4,7 +4,7 @@
#include "gnss_utils/observations.h"
#include "gnss_utils/navigation.h"
-namespace GNSSUtils
+namespace GnssUtils
{
enum RawDataType : int
{
@@ -44,12 +44,12 @@ private:
void updateObservations();
};
-inline const GNSSUtils::Observations& UBloxRaw::getObservations()
+inline const GnssUtils::Observations& UBloxRaw::getObservations()
{
return obs_;
}
-inline const GNSSUtils::Navigation& UBloxRaw::getNavigation()
+inline const GnssUtils::Navigation& UBloxRaw::getNavigation()
{
return nav_;
}
@@ -59,6 +59,6 @@ inline RawDataType UBloxRaw::getRawDataType() const
return raw_data_type_;
}
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif
diff --git a/include/gnss_utils/utils/rcv_position.h b/include/gnss_utils/utils/rcv_position.h
index 55fbd80..77ec4e7 100644
--- a/include/gnss_utils/utils/rcv_position.h
+++ b/include/gnss_utils/utils/rcv_position.h
@@ -20,7 +20,7 @@ extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
struct ComputePosOutput
{
@@ -64,5 +64,5 @@ int estposOwn(const obsd_t* obs,
int* vsat,
double* resp,
char* msg);
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif // INCLUDE_GNSS_UTILS_UTILS_RCV_POSITION_H_
\ No newline at end of file
diff --git a/include/gnss_utils/utils/sat_position.h b/include/gnss_utils/utils/sat_position.h
index 2edb56c..376d406 100644
--- a/include/gnss_utils/utils/sat_position.h
+++ b/include/gnss_utils/utils/sat_position.h
@@ -20,7 +20,7 @@ extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
double computeSatElevation(const Eigen::Vector3d& receiver_ecef, const Eigen::Vector3d& sat_ecef);
@@ -28,5 +28,5 @@ void computeSatellitesPositions(const Observations& obs,
const Navigation& nav,
const prcopt_t& opt,
std::map<int, Eigen::Vector3d>& sats_pos);
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif // INCLUDE_GNSS_UTILS_UTILS_SAT_POSITION_H_
\ No newline at end of file
diff --git a/include/gnss_utils/utils/transformations.h b/include/gnss_utils/utils/transformations.h
index 494d5ec..ebed329 100644
--- a/include/gnss_utils/utils/transformations.h
+++ b/include/gnss_utils/utils/transformations.h
@@ -16,7 +16,7 @@ extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
Eigen::Vector3d ecefToLatLonAlt(const Eigen::Vector3d& _ecef);
Eigen::Vector3d latLonAltToEcef(const Eigen::Vector3d& _latlon);
@@ -30,5 +30,5 @@ void computeEnuEcefFromLatLonAlt(const Eigen::Vector3d& _ENU_latlonalt,
Eigen::Matrix3d& R_ENU_ECEF,
Eigen::Vector3d& t_ENU_ECEF);
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif // INCLUDE_GNSS_UTILS_UTILS_TRANSFORMATIONS_H_
\ No newline at end of file
diff --git a/include/gnss_utils/utils/utils.h b/include/gnss_utils/utils/utils.h
index faa390a..cae7d5c 100644
--- a/include/gnss_utils/utils/utils.h
+++ b/include/gnss_utils/utils/utils.h
@@ -7,13 +7,13 @@
#include <string>
#define ARRAY_SIZE(arr) sizeof(arr) / sizeof(arr[0])
-#define GNSSUTILS_MSG "--GNSSUtils--"
+#define GNSSUTILS_MSG "--GnssUtils--"
extern "C" {
#include "rtklib.h"
}
-namespace GNSSUtils
+namespace GnssUtils
{
void print(std::string& _msg);
void printArray(std::string _name, int* _array, int size);
@@ -40,6 +40,6 @@ bool equalTime(const gtime_t& time1, const gtime_t& time2);
bool equalObservations(const obsd_t& obs1, const obsd_t& obs2);
bool equalObservations(const obs_t& obs1, const obs_t& obs2);
-} // namespace GNSSUtils
+} // namespace GnssUtils
#endif
\ No newline at end of file
diff --git a/src/TDCP.cpp b/src/TDCP.cpp
index 66e5a10..e477aac 100644
--- a/src/TDCP.cpp
+++ b/src/TDCP.cpp
@@ -7,7 +7,7 @@
#include "../include/gnss_utils/TDCP.h"
-namespace GNSSUtils
+namespace GnssUtils
{
bool TDCP(const Observations& obs_r,
Navigation& nav_r,
@@ -576,4 +576,4 @@ void filterCommonSatellites(Observations& common_obs_r,
// std::cout << "final size: " << common_obs_k.size() << std::endl;
}
-} // namespace GNSSUtils
+} // namespace GnssUtils
diff --git a/src/examples/gnss_utils_test.cpp b/src/examples/gnss_utils_test.cpp
index 10520e0..1a59e2d 100644
--- a/src/examples/gnss_utils_test.cpp
+++ b/src/examples/gnss_utils_test.cpp
@@ -12,7 +12,7 @@ extern "C" {
#include "../deps/RTKLIB/src/rinex.c"
}
-using namespace GNSSUtils;
+using namespace GnssUtils;
int main(int argc, char* argv[])
{
diff --git a/src/navigation.cpp b/src/navigation.cpp
index 398d0a8..66b861b 100644
--- a/src/navigation.cpp
+++ b/src/navigation.cpp
@@ -1,6 +1,6 @@
#include "gnss_utils/navigation.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
Navigation::Navigation()
{
diff --git a/src/observations.cpp b/src/observations.cpp
index e68fb8d..64fa750 100644
--- a/src/observations.cpp
+++ b/src/observations.cpp
@@ -1,6 +1,6 @@
#include "gnss_utils/observations.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
Observations::Observations()
{
@@ -159,7 +159,7 @@ void Observations::removeObservationBySat(const int& _sat)
void Observations::print(obsd_t& _obs)
{
std::string msg = "Observation of satellite #" + std::to_string(_obs.sat);
- GNSSUtils::print(msg);
+ GnssUtils::print(msg);
std::cout << "Time [s]: " << _obs.time.time << " + " << _obs.time.sec << "\n";
printArray("SNR: ", _obs.SNR, ARRAY_SIZE(_obs.SNR));
printArray("LLI: ", _obs.LLI, ARRAY_SIZE(_obs.LLI));
diff --git a/src/ublox_raw.cpp b/src/ublox_raw.cpp
index 9cc2442..7c12df5 100644
--- a/src/ublox_raw.cpp
+++ b/src/ublox_raw.cpp
@@ -1,6 +1,6 @@
#include "gnss_utils/ublox_raw.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
UBloxRaw::UBloxRaw() : raw_data_type_(NO)
{
diff --git a/src/utils/rcv_position.cpp b/src/utils/rcv_position.cpp
index 32ced17..590c91d 100644
--- a/src/utils/rcv_position.cpp
+++ b/src/utils/rcv_position.cpp
@@ -7,12 +7,12 @@
#include "gnss_utils/utils/rcv_position.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
-namespace GNSSUtils
+namespace GnssUtils
{
-ComputePosOutput computePos(const GNSSUtils::Observations& _observations,
- GNSSUtils::Navigation& _navigation,
+ComputePosOutput computePos(const GnssUtils::Observations& _observations,
+ GnssUtils::Navigation& _navigation,
const prcopt_t& _prcopt)
{
// Remove duplicated satellites
@@ -24,7 +24,7 @@ ComputePosOutput computePos(const GNSSUtils::Observations& _observations,
// Remove duplicated satellites
_navigation.uniqueNavigation();
- GNSSUtils::ComputePosOutput output;
+ GnssUtils::ComputePosOutput output;
sol_t sol;
sol = { { 0 } };
@@ -59,8 +59,8 @@ ComputePosOutput computePos(const GNSSUtils::Observations& _observations,
return output;
}
-// ComputePosOutput computePosOwn(const GNSSUtils::Observations & _observations,
-// GNSSUtils::Navigation & _navigation,
+// ComputePosOutput computePosOwn(const GnssUtils::Observations & _observations,
+// GnssUtils::Navigation & _navigation,
// const prcopt_t & _prcopt)
// {
@@ -70,7 +70,7 @@ ComputePosOutput computePos(const GNSSUtils::Observations& _observations,
// // Define error msg
// char msg[128] = "";
-// GNSSUtils::ComputePosOutput output;
+// GnssUtils::ComputePosOutput output;
// sol_t sol;
// sol = {{0}};
@@ -261,4 +261,4 @@ int estposOwn(const obsd_t* obs,
return 0;
}
-} // namespace GNSSUtils
\ No newline at end of file
+} // namespace GnssUtils
\ No newline at end of file
diff --git a/src/utils/sat_position.cpp b/src/utils/sat_position.cpp
index 287fcdf..750441e 100644
--- a/src/utils/sat_position.cpp
+++ b/src/utils/sat_position.cpp
@@ -7,9 +7,9 @@
#include "gnss_utils/utils/sat_position.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
-namespace GNSSUtils
+namespace GnssUtils
{
double computeSatElevation(const Eigen::Vector3d& receiver_ecef, const Eigen::Vector3d& sat_ecef)
{
@@ -60,4 +60,4 @@ void computeSatellitesPositions(const Observations& obs,
// sats_pos[obs.getObservationByIdx(i).sat].transpose() << std::endl;
}
}
-} // namespace GNSSUtils
\ No newline at end of file
+} // namespace GnssUtils
\ No newline at end of file
diff --git a/src/utils/transformations.cpp b/src/utils/transformations.cpp
index c12f2db..38097f5 100644
--- a/src/utils/transformations.cpp
+++ b/src/utils/transformations.cpp
@@ -1,8 +1,8 @@
#include "gnss_utils/utils/transformations.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
-namespace GNSSUtils
+namespace GnssUtils
{
Eigen::Vector3d ecefToLatLonAlt(const Eigen::Vector3d& _ecef)
@@ -101,7 +101,7 @@ void computeEnuEcefFromEcef(const Eigen::Vector3d& _t_ECEF_ENU,
//
// t_ENU_ECEF = -R_ENU_ECEF*_t_ECEF_ENU;
- Eigen::Vector3d ENU_lat_lon_alt = GNSSUtils::ecefToLatLonAlt(_t_ECEF_ENU);
+ Eigen::Vector3d ENU_lat_lon_alt = GnssUtils::ecefToLatLonAlt(_t_ECEF_ENU);
double sLat = sin(ENU_lat_lon_alt(0));
double cLat = cos(ENU_lat_lon_alt(0));
@@ -149,4 +149,4 @@ void computeEnuEcefFromLatLonAlt(const Eigen::Vector3d& _ENU_latlonalt,
t_ENU_ECEF = -R_ENU_ECEF * t_ECEF_ENU;
}
-} // namespace GNSSUtils
\ No newline at end of file
+} // namespace GnssUtils
\ No newline at end of file
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 5336b04..48fca36 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -1,6 +1,6 @@
#include "gnss_utils/utils/utils.h"
-namespace GNSSUtils
+namespace GnssUtils
{
void print(std::string& _msg)
{
@@ -117,4 +117,4 @@ bool equalObservations(const obs_t& obs1, const obs_t& obs2)
return true;
}
-} // namespace GNSSUtils
+} // namespace GnssUtils
diff --git a/test/gtest_observations.cpp b/test/gtest_observations.cpp
index 8015890..2726322 100644
--- a/test/gtest_observations.cpp
+++ b/test/gtest_observations.cpp
@@ -1,7 +1,7 @@
#include "gtest/utils_gtest.h"
#include "gnss_utils/observations.h"
-using namespace GNSSUtils;
+using namespace GnssUtils;
std::string rnx_file;
obs_t obs;
@@ -46,7 +46,7 @@ TEST(ObservationsTest, AddClearObservation)
TEST(ObservationsTest, LoadFromRinex)
{
- // GNSSUtils utilities
+ // GnssUtils utilities
Observations observations;
observations.loadFromRinex(rnx_file.c_str(), t_start, t_end, dt, opt);
observations.print();
diff --git a/test/gtest_transformations.cpp b/test/gtest_transformations.cpp
index 8984b10..22f7831 100644
--- a/test/gtest_transformations.cpp
+++ b/test/gtest_transformations.cpp
@@ -7,7 +7,7 @@ static double kSemiminorAxis = 6356752.3142;
static double kFirstEccentricitySquared = 6.69437999014 * 0.001;
static double kSecondEccentricitySquared = 6.73949674228 * 0.001;
-using namespace GNSSUtils;
+using namespace GnssUtils;
TEST(TransformationsTest, ecefToLatLonAlt)
{
--
GitLab