[Positioning] Fix #include and class declarations

Where possible, put the #include in the .cc file instead of the header
file.
Include <ostream> when <iostream> is not needed.

Fix a bug in operator<<() for Measurement: NULL value of ap and mobile
was not checked.

owlps-positioning/accesspoint.hh

@@ -4,8 +4,6 @@
 #include "wifidevice.hh"
 #include "point3d.hh"
 
-#include <iostream>
-
 #define AP_DEFAULT_CHANNEL 6
 #define AP_DEFAULT_ANTENNA_GAIN 5
 

owlps-positioning/area.hh

@@ -5,8 +5,8 @@ class Building ;
 
 #include "point3d.hh"
 
-#include <iostream>
 #include <string>
+#include <ostream>
 
 class Area
 {

owlps-positioning/building.cc

@@ -1,6 +1,6 @@
 #include "building.hh"
-#include "waypoint.hh"
 #include "area.hh"
+#include "waypoint.hh"
 
 
 using namespace std ;

owlps-positioning/building.hh

@@ -4,8 +4,9 @@
 class Area ;
 class Waypoint ;
 
-#include <iostream>
+#include <string>
 #include <vector>
+#include <ostream>
 
 class Building
 {

owlps-positioning/calibrationmeasurement.hh

@@ -5,8 +5,6 @@ class ReferencePoint ;
 
 #include "measurement.hh"
 
-#include <iostream>
-
 class CalibrationMeasurement: public Measurement
 {
 protected:

owlps-positioning/measurement.cc

@@ -96,7 +96,10 @@ bool Measurement::operator==(const Measurement &m)
 ostream &operator<<(ostream &os, const Measurement &m)
 {
   // MAC addresses
-  os << m.mobile->get_mac_addr() << "->" << m.ap->get_mac_addr() << ": " ;
+  os
+      << (m.mobile != NULL ? m.mobile->get_mac_addr() : "Unknown_mobile")
+      << "->" << (m.ap != NULL ? m.ap->get_mac_addr() : "Unknown_AP")
+      << ": " ;
 
   // List of SS
   if (m.ss_list.size() == 0)

owlps-positioning/measurement.hh

@@ -4,10 +4,9 @@
 #include "mobile.hh"
 #include "accesspoint.hh"
 
-#include <iostream>
-#include <string>
 #include <vector>
-#include <math.h>
+#include <ostream>
+#include <cmath>
 
 class Measurement
 {

owlps-positioning/mobile.hh

@@ -3,7 +3,7 @@
 
 #include "wifidevice.hh"
 
-#include <iostream>
+#include <ostream>
 
 #define MOBILE_DEFAULT_ANTENNA_GAIN 2
 

owlps-positioning/point3d.hh

@@ -1,7 +1,7 @@
 #ifndef _OWLPS_POSITIONING_POINT3D_HH_
 #define _OWLPS_POSITIONING_POINT3D_HH_
 
-#include <iostream>
+#include <ostream>
 #include <cmath>
 
 class Point3D

owlps-positioning/referencepoint.hh

@@ -1,11 +1,12 @@
 #ifndef _OWLPS_POSITIONING_REFERENCEPOINT_HH_
 #define _OWLPS_POSITIONING_REFERENCEPOINT_HH_
 
-#include "point3d.hh"
+class CalibrationMeasurement ;
-#include "calibrationmeasurement.hh"
+
+#include "point3d.hh"
 
-#include <iostream>
 #include <vector>
+#include <ostream>
 
 class ReferencePoint: public Point3D
 {

owlps-positioning/waypoint.hh

@@ -1,10 +1,11 @@
 #ifndef _OWLPS_POSITIONING_WAYPOINT_HH_
 #define _OWLPS_POSITIONING_WAYPOINT_HH_
 
-#include "point3d.hh"
+class Building ;
-#include "building.hh"
 
-#include <iostream>
+#include "point3d.hh"
+
+#include <ostream>
 #include <vector>
 #include <stdexcept>
 

owlps-positioning/wifidevice.cc

@@ -1,6 +1,5 @@
 #include "wifidevice.hh"
 
-
 using namespace std ;
 
 

owlps-positioning/wifidevice.hh

@@ -3,7 +3,8 @@
 
 #include "posutil.hh"
 
-#include <iostream>
+#include <string>
+#include <ostream>
 
 #define WIFIDEVICE_DEFAULT_ANTENNA_GAIN 2
 #define WIFIDEVICE_DEFAULT_TRX_POWER 20 // 20 dBm = 100 mW