[Witrack-svn] SF.net SVN: witrack:[40] trunk

[<th...@us...>]

Revision: 40
          http://witrack.svn.sourceforge.net/witrack/?rev=40&view=rev
Author:   thibnes
Date:     2009-01-29 19:01:55 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java
    trunk/Server/net/witrack/server/DeviceWorker.java

Modified: trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java
===================================================================
--- trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java	2008-06-17 02:46:45 UTC (rev 39)
+++ trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java	2009-01-29 19:01:55 UTC (rev 40)
@@ -97,7 +97,7 @@
 		//_grid = new Box[_nbBoxY][_nbBoxX];
 		_grid = new Box[_nbBoxY][_nbBoxX];
 		_maxpower = -10;
-	    _minpower = -60; // avant modif tom =>> 40    
+	    _minpower = -80;    
 	    _coef_color_asc =  255 / -((double)(_minpower - _maxpower) / 2);
 	    _coef_color_desc = -_coef_color_asc;
 	    _scale = 5;

Modified: trunk/Server/net/witrack/server/DeviceWorker.java
===================================================================
--- trunk/Server/net/witrack/server/DeviceWorker.java	2008-06-17 02:46:45 UTC (rev 39)
+++ trunk/Server/net/witrack/server/DeviceWorker.java	2009-01-29 19:01:55 UTC (rev 40)
@@ -190,7 +190,7 @@
 		Integer building = new Integer(0);
 		Integer map = new Integer(0);
 		int delta = 2 ;
-		int match = 3;
+		int match = 3; //Means that the client see at leat 3 APs.
 		
 		//apList example : 000EA6B7DC46:-77;001217DFAEC2:-76
 		
@@ -210,9 +210,11 @@
 			// verifie si l'AP est connu 
 			try 
 			{
-				statement = con.createStatement();
-				ResultSet res =  statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b WHERE m.building_id=b.building_id and m.map_id=ap.map_id ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
+				statement = con.createStatement();		
+				//ResultSet res =  statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b WHERE m.building_id=b.building_id and m.map_id=ap.map_id and ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
+				ResultSet res =  statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b, maps m WHERE m.building_id=b.building_id and m.map_id=ap.map_id and ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
 				
+				/*
 				if (Math.abs(power) < bestPower && res.next())
 				{
 					allApKnown.add(oneAp);
@@ -226,6 +228,23 @@
 				{
 					allApKnown.add(oneAp);
 				}
+				*/
+				
+				if (power > bestPower && res.next())
+				{
+					allApKnown.add(oneAp);
+					bestPower = power;
+					bestAP = oneAp[0];
+					map = new Integer(res.getInt("map_id"));
+					building =  new Integer(res.getInt("building_id"));
+					area =  new Integer(res.getInt("area_id"));
+					
+					//System.err.println(area.toString() + " " + building.toString() + " " + map.toString());
+				}
+				else if (res.next())
+				{
+					allApKnown.add(oneAp);
+				}
 			} 
 			catch (SQLException e1) {
 				e1.printStackTrace();
@@ -269,7 +288,7 @@
 		try 
 		{
 				statement = con.createStatement();
-				System.out.println("SQL STATMENT " + sqlStament);
+				//System.out.println("SQL STATMENT " + sqlStament);
 				ResultSet res =  statement.executeQuery(sqlStament);
 				
 				if (res.next())
@@ -279,7 +298,7 @@
 				}
 				else
 				{
-					System.err.println("\nPAS DE POS TROUVEE\n");
+					System.err.println("\nNo positions found\n");
 				}
 		} 
 		catch (SQLException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.