WIP

CMakeLists.txt

@@ -117,15 +117,16 @@ SET(RTKLIB_SRC
 
 # application header files
 SET(HEADERS
-    include/gnss_utils/utils/utils.h
-    include/gnss_utils/utils/transformations.h
-    include/gnss_utils/utils/rcv_position.h
-    include/gnss_utils/utils/sat_position.h
     include/gnss_utils/observations.h
     include/gnss_utils/navigation.h
     include/gnss_utils/tdcp.h
     include/gnss_utils/ublox_raw.h
-  ${RTKLIB_SRC_DIR}/rtklib.h)
+    ${RTKLIB_SRC_DIR}/rtklib.h)
+SET(HEADERS_UTILS
+    include/gnss_utils/utils/utils.h
+    include/gnss_utils/utils/transformations.h
+    include/gnss_utils/utils/rcv_position.h
+    include/gnss_utils/utils/sat_position.h)
 
 # Eigen #######
 FIND_PACKAGE(Eigen3 REQUIRED)
@@ -155,10 +156,11 @@ endif()
 
 # Installing
 INSTALL(TARGETS ${PROJECT_NAME}
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION lib/iri-algorithms
-      ARCHIVE DESTINATION lib/iri-algorithms)
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib/iri-algorithms
+        ARCHIVE DESTINATION lib/iri-algorithms)
 INSTALL(FILES ${HEADERS} DESTINATION include/iri-algorithms/gnss_utils)
+INSTALL(FILES ${HEADERS_UTILS} DESTINATION include/iri-algorithms/gnss_utils/utils)
 INSTALL(FILES Findgnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 INSTALL(FILES "${GNSS_UTILS_CONFIG_DIR}/config.h"
   DESTINATION include/iri-algorithms/gnss_utils/internal)

include/gnss_utils/utils/utils.h

@@ -39,13 +39,10 @@ bool equalArray(const T* array1, const T* array2, const int& size1, const int& s
 
 }  // namespace GnssUtils
 
-//bool equalTime(const gtime_t& time1, const gtime_t& time2);
 bool operator==(const gtime_t& time1, const gtime_t& time2);
 bool operator!=(const gtime_t& time1, const gtime_t& time2);
-//bool equalObservations(const obsd_t& obs1, const obsd_t& obs2);
 bool operator==(const obsd_t& obs1, const obsd_t& obs2);
 bool operator!=(const obsd_t& obs1, const obsd_t& obs2);
-//bool equalObservations(const obs_t& obs1, const obs_t& obs2);
 bool operator==(const obs_t& obs1, const obs_t& obs2);
 bool operator!=(const obs_t& obs1, const obs_t& obs2);
 

src/utils/utils.cpp

@@ -64,7 +64,6 @@ void printArray(std::string _name, float* _array, int size)
 }  // namespace GnssUtils
 
 bool operator==(const gtime_t& time1, const gtime_t& time2)
-//bool equalTime(const gtime_t& time1, const gtime_t& time2)
 {
   return (difftime(time1.time, time2.time) == 0.0 && time1.sec == time2.sec);
 }
@@ -75,10 +74,7 @@ bool operator!=(const gtime_t& time1, const gtime_t& time2)
 }
 
 bool operator==(const obsd_t& obs1, const obsd_t& obs2)
-//bool equalObservations(const obsd_t& obs1, const obsd_t& obs2)
 {
-  std::cout <<"operator==\n";
-
   return obs1.time == obs2.time &&
          obs1.eventime == obs2.eventime &&
          obs1.timevalid == obs2.timevalid &&
@@ -101,9 +97,7 @@ bool operator!=(const obsd_t& obs1, const obsd_t& obs2)
 }
 
 bool operator==(const obs_t& obs1, const obs_t& obs2)
-//bool equalObservations(const obs_t& obs1, const obs_t& obs2)
 {
-    std::cout <<"operator==\n";
     return obs1.n == obs2.n &&
            obs1.nmax == obs2.nmax &&
            obs1.flag == obs2.flag &&