bad merge result

include/gnss_utils.h

-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
-// All rights reserved.
-//
-// This file is part of gnss_utils
-// gnss_utils is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef GNSS_UTILS_H
-#define GNSS_UTILS_H
-
-#include <vector>
-#include <iostream>
-#include <memory>
-
-#include "observation.h"
-
-extern "C"
-{
-    #include "/home/jlaplaza/RTKLIB/src/rtklib.h"
-}
-
-namespace GNSSUtils
-{
-  class Receiver
-  {
-    public:
-      // Constructor & Destructor
-      Receiver();
-      ~Receiver();
-
-      // Public objects
-
-      // Public methods
-
-
-      /* - Observations -  */
-
-      void clearObservations();
-
-      void pushObservation(obsd_t obs);
-    
-      std::vector<obsd_t> getObservations();
-
-
-      /* - Navigation - */
-
-      void clearNavigation();
-      
-      void pushNavigation(nav_t nav);
-
-      std::vector<nav_t> getNavigation();
-      
-
-      /* - Processing Options - */
-
-      void clearOptions();
-      
-      void pushOption(prcopt_t opt);
-
-      std::vector<prcopt_t> getOptions();
-
-
-      /* - Solution - */
-
-
-      /* - Satellite status - */
-
-      /* - Compute Fix - */
-
-      int computeSPP(double *azel, char *msg);
-    
-    private:
-      // rtklib-like attribute to represent the different observation msgs for a given epoch
-      std::vector<obsd_t> _obsVector;
-  
-      // rtklib-like attribute to represent the different navigation msgs for a given epoch
-      std::vector<nav_t> _navVector;
-
-      // rtklib-like attribute to represent the different options for a given epoch
-      std::vector<prcopt_t> _opt;
-
-      // rtklib-like attribute to represent the solution for a given epoch
-      std::Vector<sol_t> _sol;
-
-      // rtklib-like attribute to represent the satellite status for a given epoch
-      std::vector<ssat_t> _ssat;
-
-      
-
-      
-
-  };
-}
-#endif