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

[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-serv20339/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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TraceAnalyser.java	10 Apr 2006 06:15:47 -0000	1.8
--- TraceAnalyser.java	11 Apr 2006 04:49:43 -0000	1.9
***************
*** 35,45 ****
  	private void analyze() {		
  		
! 		int numGoodQueries = 0, numBadQueries = 0, numFailedQueries = 0, numErrors = 0;
  		
  		// Find out the number of erroneous location lookups
  		for (int i = 0; i < trace.size(); i++) {
  			TraceLine line = trace.get(i);
! 			
! 			if (line.action.equals("AGENT_MOVED")) {
  				AgillaAgentID key = new AgillaAgentID(line.agentID);
  				if (agentLocTable.containsKey(key))
--- 35,63 ----
  	private void analyze() {		
  		
! 		int numGoodQueries = 0, numBadQueries = 0, numFailedQueries = 0; //, numErrors = 0;
! 		int numQueryMessages = 0, numResultsMessages = 0, numLocationUpdateMessages = 0;
! 		double errorSum = 0;
  		
  		// Find out the number of erroneous location lookups
  		for (int i = 0; i < trace.size(); i++) {
  			TraceLine line = trace.get(i);
! 					
! 			if (line.action.equals("QUERY_GET_LOCATION_ISSUED") || 
! 					line.action.equals("QUERY_GET_LOCATION_FORWARDED") ||
! 					line.action.equals("QUERY_GET_CLOSEST_AGENT_ISSUED") ||
! 					line.action.equals("QUERY_GET_CLOSEST_AGENT_FORWARDED")) 
! 			{
! 				numQueryMessages++;
! 			} else if (line.action.equals("QUERY_GET_LOCATION_RESULTS_FORWARDED") ||
! 					line.action.equals("QUERY_GET_LOCATION_RESULTS_RECEIVED") ||
! 					line.action.equals("QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED") ||
! 					line.action.equals("QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED")) 
! 			{
! 				numResultsMessages++;
! 				
! 			} else if (line.action.equals("AGENT_LOCATION_SENT")) 
! 			{
! 				numLocationUpdateMessages++;
! 			} else if (line.action.equals("AGENT_MOVED")) {						
  				AgillaAgentID key = new AgillaAgentID(line.agentID);
  				if (agentLocTable.containsKey(key))
***************
*** 66,70 ****
  //				}
  			}
! 			else if (line.action.equals("QUERY_GET_LOCATION_RESULTS_RECEIVED")) {
  				if (line.agentID == QUERIER_AGENT_ID) {
  					if (line.success) {
--- 84,89 ----
  //				}
  			}
! 			
! 			if (line.action.equals("QUERY_GET_LOCATION_RESULTS_RECEIVED")) {
  				if (line.agentID == QUERIER_AGENT_ID) {
  					if (line.success) {
***************
*** 73,78 ****
  							numGoodQueries++;
  						else {
! 							log("Bad Result: returned " + line.loc + ", intruder at " + intruderLoc);
  							numBadQueries++;
  						}
  					} else
--- 92,98 ----
  							numGoodQueries++;
  						else {
! 							log("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
***************
*** 80,84 ****
  				}
  			}
! 			else if (line.action.equals("QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED")) {
  				if (line.agentID == QUERIER_AGENT_ID) {	
  					if (line.success) {
--- 100,105 ----
  				}
  			}
! 			
! 			if (line.action.equals("QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED")) {
  				if (line.agentID == QUERIER_AGENT_ID) {	
  					if (line.success) {
***************
*** 118,122 ****
  		System.out.println("\nQuery Statistics:  Good: " + numGoodQueries + ", Bad: " + numBadQueries + ", Failed: " + numFailedQueries);
  		System.out.println("Total Number of Queries: " + (numGoodQueries + numBadQueries + numFailedQueries));
! 		System.out.println("Number of Errors: " + numErrors);
  	}
  	
--- 139,147 ----
  		System.out.println("\nQuery Statistics:  Good: " + numGoodQueries + ", Bad: " + numBadQueries + ", Failed: " + numFailedQueries);
  		System.out.println("Total Number of Queries: " + (numGoodQueries + numBadQueries + numFailedQueries));
! 		System.out.println("Number of Query Messages: " + numQueryMessages);
! 		System.out.println("Number of Results Messages: " + numResultsMessages);
! 		System.out.println("Number of Location Update Messages: " + numLocationUpdateMessages);
! 		System.out.println("Average Error (hops): " + errorSum/(numGoodQueries+numBadQueries));
! 		//System.out.println("Number of Errors: " + numErrors);
  	}