[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla QueryNeighborList.java, NONE, 1.1 Example of agilla.properties, NONE, 1.1 Makefile, 1.7, 1.8 AgillaProperties.java, 1.8, 1.9

[Chien-Liang Fok]

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

Modified Files:
	Makefile AgillaProperties.java 
Added Files:
	QueryNeighborList.java Example of agilla.properties 
Log Message:


--- NEW FILE: QueryNeighborList.java ---
package edu.wustl.mobilab.agilla;

import java.util.Vector;

public class QueryNeighborList implements AgillaConstants {
	private SNInterface sni;
	
	public QueryNeighborList(String source, boolean debug) throws Exception {
		AgentInjector injector = new AgentInjector(source, debug);
		
		Vector nbrs = injector.queryNbrList(TOS_BCAST_ADDRESS, (short)1);
		
		if (nbrs.size() != 0) {
			String nbrString = "\nAddress\t\tHops To Gateway\t\tLink Quality\n";
			for (int i = 0; i < nbrs.size(); i++) {
				Address addr = (Address)nbrs.get(i);
				nbrString += addr.addr() + "\t\t" + addr.hopsToGW() + "\t\t\t" + addr.lqi();
				if (i < nbrs.size()-1)
					nbrString += "\n";
			}		    
			System.out.println(nbrString);
		} else {
		    System.out.println("No neighbors!");
		}
		System.exit(0);
	}
	
	public static void main(String[] args) {
		String source = "COM1:mica2"; //"sf at localhost:9001";
		boolean debug = false;
		
		if (args.length == 0) {
			usage();
			System.exit(0);
		}
					
		try {
			int index = 0;
			while (index < args.length) {
				String arg = args[index];
				if (arg.equals("-h") || arg.equals("--help")) {
					usage();
					System.exit(0);
				} else if (arg.equals("-comm")) {
					index++;
					source = args[index];
				}else if (arg.equals("-d")) {
					debug = true;
				} else {
					usage();
					System.exit(1);
				}
				index++;
			}			
		} catch (Exception e) {
			e.printStackTrace();
		}
		
		System.out.println("Connecting to: " + source);
		try {
			new QueryNeighborList(source, debug);
		} catch(Exception e) {
			e.printStackTrace();
		}
	}
	
	private static void usage() {
		System.err.println("Usage: QueryNeithborList [-h | -comm <source> | -d]");
		System.err.println("\t-h Print this help message");
		System.err.println("\t-d Enable Debug mode");
		System.err.println("\t-comm <source> where <source> is COMx:[platform], sf at localhost:[port]");		
	}

}

--- NEW FILE: Example of agilla.properties ---
#initDir=C:\\tinyos\\cygwin\\opt\\tinyos-1.x\\contrib\\wustl\\apps\\AgillaAgents
initDir=../../apps/AgillaAgents
defaultAgent=3Blink.ma
numCol=20
runTest=false
enableClustering=true
nwName=Unk

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	5 Apr 2006 10:28:21 -0000	1.7
--- Makefile	5 Apr 2006 23:57:24 -0000	1.8
***************
*** 39,43 ****
         AgillaQueryReplyAllAgentsMsg.java \
         AgillaClusterMsg.java \
! 	AgillaClusterDebugMsg.java
  
  INITIAL_TARGETS = $(MSGS)
--- 39,48 ----
         AgillaQueryReplyAllAgentsMsg.java \
         AgillaClusterMsg.java \
!        AgillaExpQueryResultsMsg.java \
!        AgillaExpLatencyMsg.java \
!        AgillaExpResultsMsg.java \
!        AgillaTraceMsg.java \
!        AgillaClusterMsg.java \
!        AgillaClusterDebugMsg.java
  
  INITIAL_TARGETS = $(MSGS)
***************
*** 155,159 ****
--- 160,176 ----
  AgillaClusterMsg.java:
  	$(MIG) -java-classname=$(PACKAGE).messages.AgillaClusterMsg $(AGILLA)/types/Clustering.h AgillaClusterMsg -o messages/$@
+ 
+ AgillaExpQueryResultsMsg.java:
+ 	$(MIG) -java-classname=$(PACKAGE).messages.AgillaExpQueryResultsMsg $(AGILLA)/types/ExpLogger.h AgillaExpQueryResultsMsg -o messages/$@
+ 
+ AgillaExpLatencyMsg.java:
+ 	$(MIG) -java-classname=$(PACKAGE).messages.AgillaExpLatencyMsg $(AGILLA)/types/ExpLogger.h AgillaExpLatencyMsg -o messages/$@
  	
+ AgillaExpResultsMsg.java:
+ 	$(MIG) -java-classname=$(PACKAGE).messages.AgillaExpResultsMsg $(AGILLA)/types/ExpLogger.h AgillaExpResultsMsg -o messages/$@
+ 
+ AgillaTraceMsg.java:
+ 	$(MIG) -java-classname=$(PACKAGE).messages.AgillaTraceMsg $(AGILLA)/types/ExpLogger.h AgillaTraceMsg -o messages/$@
+ 		
  AgillaClusterDebugMsg.java:
  	$(MIG) -java-classname=$(PACKAGE).messages.AgillaClusterDebugMsg $(AGILLA)/types/Clustering.h AgillaClusterDebugMsg -o messages/$@

Index: AgillaProperties.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/AgillaProperties.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AgillaProperties.java	5 Apr 2006 10:28:21 -0000	1.8
--- AgillaProperties.java	5 Apr 2006 23:57:24 -0000	1.9
***************
*** 51,55 ****
  	private static final String DEFAULT_NUM_COL = "20";
  	private static final String DEFAULT_ENABLE_CLUSTERING = "false";
! 	private static final String DEFAULT_NETWORK_NAME = "Unk";
  	private static String initDir, defaultAgent, nwName;
  	private static int numCol;
--- 51,55 ----
  	private static final String DEFAULT_NUM_COL = "20";
  	private static final String DEFAULT_ENABLE_CLUSTERING = "false";
! 	private static final String DEFAULT_NETWORK_NAME = "unk";
  	private static String initDir, defaultAgent, nwName;
  	private static int numCol;