From 7a5fd431f4b142c6927585cfa2b5d63233bf0660 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Wed, 15 Oct 2008 14:18:04 +0000
Subject: [PATCH] =?UTF-8?q?Rien=20de=20tr=C3=A8s=20transcendant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Retouches mineures et décommentaire de checkTopology() dans le
constructeur de Server.

git-svn-id: https://pif.pu-pm.univ-fcomte.fr/svn/loc@78 785a6c6c-259e-4ff1-8b91-dc31627914f0
---
 owlps-positioning/Makefile   | 12 ++++++------
 owlps-positioning/guinumo.cc |  3 +--
 owlps-positioning/server.cc  | 12 +++++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/owlps-positioning/Makefile b/owlps-positioning/Makefile
index 2fad485..3d521e7 100644
--- a/owlps-positioning/Makefile
+++ b/owlps-positioning/Makefile
@@ -1,11 +1,11 @@
-GXX=g++
-DEBUG=-g
-GXXFLAGS=$(DEBUG) -Wall -pedantic
-LD=g++
-LDFLAGS=-lm
+GXX = g++
+DEBUG = -g
+GXXFLAGS = $(DEBUG) -Wall -pedantic
+LD = g++
+LDFLAGS = -lm
 
 TARGET = guinumo
-HEADER=guinumo.hh
+HEADER = guinumo.hh
 
 all : ${TARGET}
 
diff --git a/owlps-positioning/guinumo.cc b/owlps-positioning/guinumo.cc
index 8f6bd75..c008164 100644
--- a/owlps-positioning/guinumo.cc
+++ b/owlps-positioning/guinumo.cc
@@ -9,7 +9,6 @@
 #include "point.hh"
 
 using namespace std;
-using std::string;
 
 
 int main(int argc, char ** argv)
@@ -31,8 +30,8 @@ int main(int argc, char ** argv)
 		Server server(apfile, refptfile) ;
 		//server.createClient() ;
 		//server.monitorClient(0, ALGO_CONTINU_FRBHM) ;
-		string logfile = argv[4];
 		string testfile = argv[3];
+		string logfile = argv[4];
 		server.radar_exp(logfile, testfile);
 
 		cout << argv[0] << " : fin." << endl ;
diff --git a/owlps-positioning/server.cc b/owlps-positioning/server.cc
index 9be8693..95a1e0f 100644
--- a/owlps-positioning/server.cc
+++ b/owlps-positioning/server.cc
@@ -236,11 +236,13 @@ Server::Server(const string &ap_file, const string &ref_pt_file, const string &i
 	makeWaypointListFromFile(DEFAULT_WAYPOINT_FILE) ; // Initialisation de "waypoint_list" et "waypoint_matrix".
 	makeReferencePointListFromFile(ref_pt_file.c_str()) ; // Initialisation de "reference_point_list".
 
-	/*if (! checkTopology()) // Vérifications.
-  {
-	  cout << "Topology flawed.\nExiting program." << endl ;
-	  exit(1) ; // Si problème, on quitte.
-  }*/
+	/* *** À commenter pour utiliser les mesures centrées mobile de Fred */
+	if (! checkTopology()) // Vérifications.
+	  {
+	    cerr << "Topology flawed. Exiting program." << endl ;
+	    exit(1) ; // Si problème, on quitte.
+	  }
+	/* Fin du bloc à commenter *** */
 
 	makeReferencePointDistances() ; // Initialisation de "reference_point_matrix".
 	makeApListFromFile(ap_file.c_str()) ; // Initialisation de "access_point_list".