[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory ExperimentDataCollector.java, 1.11, 1.12

[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-serv9385/edu/wustl/mobilab/directory

Modified Files:
	ExperimentDataCollector.java 
Log Message:


Index: ExperimentDataCollector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/directory/ExperimentDataCollector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ExperimentDataCollector.java	10 Apr 2006 23:23:32 -0000	1.11
--- ExperimentDataCollector.java	10 Apr 2006 23:27:07 -0000	1.12
***************
*** 26,30 ****
  	public static final int AGENT_MIGRATING = 6;
  	public static final int QUERY_GET_CLOSEST_AGENT_ISSUED = 7;
! 	public static final int QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED = 8;
  	public static final int CLUSTER_AGENT_ADDED = 9;
  	public static final int CLUSTER_AGENT_REMOVED = 10;
--- 26,30 ----
  	public static final int AGENT_MIGRATING = 6;
  	public static final int QUERY_GET_CLOSEST_AGENT_ISSUED = 7;
! 	public static final int QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED = 8;	
  	public static final int CLUSTER_AGENT_ADDED = 9;
  	public static final int CLUSTER_AGENT_REMOVED = 10;
***************
*** 35,38 ****
--- 35,43 ----
  	public static final int QUERY_GET_CLOSEST_AGENT_FORWARDED = 15;
  	public static final int QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED = 16;
+ 	public static final int QUERY_GET_AGENTS_ISSUED = 17;
+ 	public static final int QUERY_GET_AGENTS_RESULT_RECEIVED = 18;
+ 	public static final int QUERY_GET_AGENTS_FORWARDED = 19;
+ 	public static final int QUERY_GET_AGENTS_RESULTS_FORWARDED = 20;
+ 	
  	
  	public static final int MAX_NUM_QUERIES = 100;  // how many queries to wait for before stopping experiment
***************
*** 57,60 ****
--- 62,66 ----
  			moteIF.registerListener(new AgillaExpResultsMsg(), mote);
  			moteIF.registerListener(new AgillaTraceMsg(), traceRcvr);
+ 			moteIF.registerListener(new AgillaTraceGetAgentsMsg(), traceRcvr);
  			motes.add(mote);
  		}		
***************
*** 121,124 ****
--- 127,136 ----
  	}
  	
+ 	/**
+ 	 *  Receives trace messages and prints them to the screen.  The text can then
+ 	 *  be piped into a file that can be analyzed using TraceAnalyser.
+ 	 *  
+ 	 * @author liang	 
+ 	 */
  	private class TraceReceiver implements MessageListener {		
  		public TraceReceiver() {
***************
*** 161,183 ****
  			case QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED:
  				return "QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED";
  			}
  			return "UNKNOWN";
  		}
  		
! 		public void messageReceived(int to, Message m) {				
! 			AgillaTraceMsg trace = (AgillaTraceMsg)m;
! 			System.out.println("TRACE: " + trace.get_agentID() + " " + trace.get_nodeID() + " "
! 					+ trace.get_timestamp_high32() + "" + trace.get_timestamp_low32() + " "
! 					+ convString(trace.get_action()) + " " + trace.get_qid() + " " + trace.get_success() + " " 
! 					+ trace.get_loc_x()+ " " + trace.get_loc_y());
  			
! 			// once MAX_NUM_QUERIES has been performed, stop the experiment
! 			if (trace.get_action() == QUERY_GET_LOCATION_RESULTS_RECEIVED
! 					|| trace.get_action() == QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED) {
! 				if (++numQs == MAX_NUM_QUERIES) {
! 					frame.setVisible(false);
! 					doFinish();
! 				} else
! 					resultCountLabel.setText("" + numQs);
  			}
  		}		
--- 173,217 ----
  			case QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED:
  				return "QUERY_GET_CLOSEST_AGENT_RESULTS_FORWARDED";
+ 			case QUERY_GET_AGENTS_ISSUED:
+ 				return "QUERY_GET_AGENTS_ISSUED";
+ 			case QUERY_GET_AGENTS_RESULT_RECEIVED:
+ 				return "QUERY_GET_AGENTS_RESULT_RECEIVED";
+ 			case QUERY_GET_AGENTS_FORWARDED:
+ 				return "QUERY_GET_AGENTS_FORWARDED";
+ 			case QUERY_GET_AGENTS_RESULTS_FORWARDED:
+ 				return "QUERY_GET_AGENTS_RESULTS_FORWARDED";
  			}
  			return "UNKNOWN";
  		}
  		
! 		public void messageReceived(int to, Message m) {			
  			
! 			if (m.amType() == AgillaTraceMsg.AM_TYPE)
! 			{
! 				AgillaTraceMsg trace = (AgillaTraceMsg)m;
! 				System.out.println("TRACE: " + trace.get_agentID() + " " + trace.get_nodeID() + " "
! 						+ trace.get_timestamp_high32() + "" + trace.get_timestamp_low32() + " "
! 						+ convString(trace.get_action()) + " " + trace.get_qid() + " " + trace.get_success() + " " 
! 						+ trace.get_loc_x()+ " " + trace.get_loc_y());
! 				
! 				// once MAX_NUM_QUERIES has been performed, stop the experiment
! 				if (trace.get_action() == QUERY_GET_LOCATION_RESULTS_RECEIVED
! 						|| trace.get_action() == QUERY_GET_CLOSEST_AGENT_RESULTS_RECEIVED) {
! 					if (++numQs == MAX_NUM_QUERIES) {
! 						frame.setVisible(false);
! 						doFinish();
! 					} else
! 						resultCountLabel.setText("" + numQs);
! 				}
! 			} else
! 			{
! 				AgillaTraceGetAgentsMsg trace = (AgillaTraceGetAgentsMsg)m;
! 				String logme = ("TRACE_GET_AGENTS: " + trace.get_agentID() + " " + trace.get_nodeID() + " "
! 						+ trace.get_timestamp_high32() + "" + trace.get_timestamp_low32() + " "
! 						+ trace.get_qid() + " " + trace.get_num_agents() + " ");
! 				for (int i = 0; i < trace.get_num_agents(); i++) {
! 					logme += trace.getElement_agent_id_id(i) + " " + trace.getElement_loc_x(i) + " " + trace.getElement_loc_y(i);
! 				}
! 				System.out.println(logme);
  			}
  		}