[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory TraceAnalyser.java, 1.20, 1.21

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7481/edu/wustl/mobilab/directory

Modified Files:
	TraceAnalyser.java 
Log Message:


Index: TraceAnalyser.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory/TraceAnalyser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TraceAnalyser.java	27 Apr 2006 01:19:29 -0000	1.20
--- TraceAnalyser.java	2 May 2006 00:27:52 -0000	1.21
***************
*** 110,120 ****
  							numGoodQueries++;
  						else {
! 
! 							log("Timestamp: " + line.timeStamp +" Bad Result: (" + line.loc.getx() + ", " + line.loc.gety() + "), Reality: (" + intruderLoc.getx() + ", " + intruderLoc.gety()  + "), Dist: " + line.loc.dist(intruderLoc));
  							numBadQueries++;
  							errorSum += line.loc.dist(intruderLoc);
  						}
! 					} else
  						numFailedQueries++;
  				}
  			}
--- 110,121 ----
  							numGoodQueries++;
  						else {
! 							log(line.timeStamp +" Qid: " + line.qid + " Bad Result: (" + line.loc.getx() + ", " + line.loc.gety() + "), Reality: (" + intruderLoc.getx() + ", " + intruderLoc.gety()  + "), Dist: " + line.loc.dist(intruderLoc));
  							numBadQueries++;
  							errorSum += line.loc.dist(intruderLoc);
  						}
! 					} else {
! 						log(line.timeStamp + " Qid: " + line.qid + " Result contained FAIL");
  						numFailedQueries++;
+ 					}
  				}
  			}
***************
*** 227,230 ****
--- 228,236 ----
  	}
  	
+ 	/**
+ 	 * This class stores the results of a GetAgents operation.
+ 	 * 
+ 	 * @author liang	 
+ 	 */
  	private class GetAgentsResults {
  		int qid;