From bc6a5684148b78c855ef596a9f7ed05a22f4357f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 3 Apr 2018 23:45:06 +0200
Subject: [PATCH] Reorder headers

---
 .../gnuradio_blocks/hybrid_observables_cc.cc    | 17 ++++++++++++-----
 .../gnuradio_blocks/hybrid_observables_cc.h     | 11 +++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index 81daa31ca..6e95da824 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -1,6 +1,6 @@
 /*!
  * \file hybrid_observables_cc.cc
- * \brief Implementation of the pseudorange computation block
+ * \brief Implementation of the observables computation block
  * \author Javier Arribas 2017. jarribas(at)cttc.es
  * \author Antonio Ramos  2018. antonio.ramos(at)cttc.es
  *
@@ -30,6 +30,7 @@
  */
 
 #include "hybrid_observables_cc.h"
+#include "display.h"
 #include "GPS_L1_CA.h"
 #include <armadillo>
 #include <glog/logging.h>
@@ -39,7 +40,6 @@
 #include <cmath>
 #include <iostream>
 #include <limits>
-#include "display.h"
 
 
 using google::LogMessage;
@@ -51,9 +51,12 @@ hybrid_observables_cc_sptr hybrid_make_observables_cc(unsigned int nchannels_in,
 }
 
 
-hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, std::string dump_filename) : gr::block("hybrid_observables_cc",
-                                                                                                                                                gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)),
-                                                                                                                                                gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro)))
+hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in,
+    unsigned int nchannels_out,
+    bool dump,
+    std::string dump_filename) : gr::block("hybrid_observables_cc",
+                                     gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)),
+                                     gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro)))
 {
     d_dump = dump;
     d_nchannels = nchannels_out;
@@ -298,6 +301,7 @@ int hybrid_observables_cc::save_matfile()
     return 0;
 }
 
+
 bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque<Gnss_Synchro> &data, const double &ti)
 {
     if ((ti < data.front().RX_time) or (ti > data.back().RX_time))
@@ -334,6 +338,7 @@ bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque<Gnss_
     return result.is_finite();
 }
 
+
 double hybrid_observables_cc::compute_T_rx_s(const Gnss_Synchro &a)
 {
     if (a.Flag_valid_word)
@@ -357,6 +362,7 @@ void hybrid_observables_cc::forecast(int noutput_items __attribute__((unused)),
     ninput_items_required[d_nchannels] = 1;
 }
 
+
 void hybrid_observables_cc::clean_history(std::deque<Gnss_Synchro> &data)
 {
     while (data.size() > 0)
@@ -372,6 +378,7 @@ void hybrid_observables_cc::clean_history(std::deque<Gnss_Synchro> &data)
         }
 }
 
+
 void hybrid_observables_cc::correct_TOW_and_compute_prange(std::vector<Gnss_Synchro> &data)
 {
     std::vector<Gnss_Synchro>::iterator it;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index cf5f775d4..aedba43ab 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -36,11 +36,11 @@
 
 #include "gnss_synchro.h"
 #include <gnuradio/block.h>
+#include <boost/dynamic_bitset.hpp>
 #include <fstream>
 #include <string>
-#include <vector>  //std::vector
+#include <vector>
 #include <deque>
-#include <boost/dynamic_bitset.hpp>
 
 
 class hybrid_observables_cc;
@@ -57,9 +57,9 @@ class hybrid_observables_cc : public gr::block
 {
 public:
     ~hybrid_observables_cc();
-    int general_work(int noutput_items, gr_vector_int &ninput_items,
-        gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
-    void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+    int general_work(int noutput_items, gr_vector_int& ninput_items,
+        gr_vector_const_void_star& input_items, gr_vector_void_star& output_items);
+    void forecast(int noutput_items, gr_vector_int& ninput_items_required);
 
 private:
     friend hybrid_observables_cc_sptr
@@ -82,7 +82,6 @@ private:
     unsigned int d_num_valid_channels;
     std::string d_dump_filename;
     std::ofstream d_dump_file;
-
 };
 
 #endif