PingAppReporter class can be used to record
* information about the application behavior.
- *
+ *
* @see PingAppReporter
* @author teemuk
*/
@@ -43,10 +43,10 @@ public class PingApplication extends Application {
public static final String PING_PING_SIZE = "pingSize";
/** Size of the pong message */
public static final String PING_PONG_SIZE = "pongSize";
-
+
/** Application ID */
public static final String APP_ID = "fi.tkk.netlab.PingApplication";
-
+
// Private vars
private double lastPing = 0;
private double interval = 500;
@@ -57,10 +57,10 @@ public class PingApplication extends Application {
private int pingSize=1;
private int pongSize=1;
private Random rng;
-
- /**
+
+ /**
* Creates a new ping application with the given settings.
- *
+ *
* @param s Settings to use for initializing the application.
*/
public PingApplication(Settings s) {
@@ -87,14 +87,14 @@ public PingApplication(Settings s) {
this.destMin = destination[0];
this.destMax = destination[1];
}
-
+
rng = new Random(this.seed);
super.setAppID(APP_ID);
}
-
- /**
+
+ /**
* Copy-constructor
- *
+ *
* @param a
*/
public PingApplication(PingApplication a) {
@@ -109,11 +109,11 @@ public PingApplication(PingApplication a) {
this.pingSize = a.getPingSize();
this.rng = new Random(this.seed);
}
-
- /**
+
+ /**
* Handles an incoming message. If the message is a ping message replies
* with a pong message. Generates events for ping and pong messages.
- *
+ *
* @param msg message received by the router
* @param host host to which the application instance is attached
*/
@@ -121,33 +121,33 @@ public PingApplication(PingApplication a) {
public Message handle(Message msg, DTNHost host) {
String type = (String)msg.getProperty("type");
if (type==null) return msg; // Not a ping/pong message
-
+
// Respond with pong if we're the recipient
if (msg.getTo()==host && type.equalsIgnoreCase("ping")) {
- String id = "pong" + SimClock.getIntTime() + "-" +
+ String id = "pong" + SimClock.getIntTime() + "-" +
host.getAddress();
Message m = new Message(host, msg.getFrom(), id, getPongSize());
m.addProperty("type", "pong");
m.setAppID(APP_ID);
host.createNewMessage(m);
-
+
// Send event to listeners
super.sendEventToListeners("GotPing", null, host);
super.sendEventToListeners("SentPong", null, host);
}
-
+
// Received a pong reply
if (msg.getTo()==host && type.equalsIgnoreCase("pong")) {
// Send event to listeners
super.sendEventToListeners("GotPong", null, host);
}
-
+
return msg;
}
- /**
+ /**
* Draws a random host from the destination range
- *
+ *
* @return host
*/
private DTNHost randomHost() {
@@ -159,15 +159,15 @@ private DTNHost randomHost() {
World w = SimScenario.getInstance().getWorld();
return w.getNodeByAddress(destaddr);
}
-
+
@Override
public Application replicate() {
return new PingApplication(this);
}
- /**
+ /**
* Sends a ping packet if this is an active application instance.
- *
+ *
* @param host to which the application instance is attached
*/
@Override
@@ -182,10 +182,10 @@ public void update(DTNHost host) {
m.addProperty("type", "ping");
m.setAppID(APP_ID);
host.createNewMessage(m);
-
+
// Call listeners
super.sendEventToListeners("SentPing", null, host);
-
+
this.lastPing = curTime;
}
}
diff --git a/core/Application.java b/core/Application.java
index d2aabaeec..98520c725 100644
--- a/core/Application.java
+++ b/core/Application.java
@@ -1,6 +1,6 @@
-/*
+/*
* Copyright 2010 Aalto University, ComNet
- * Released under GPLv3. See LICENSE.txt for details.
+ * Released under GPLv3. See LICENSE.txt for details.
*/
package core;
@@ -14,12 +14,12 @@
* properties of the message before returning it or return null to signal
* to the router that it wants the message to be dropped.
*
- *
+ *
*
* In addition, the application's update() method is called every
* simulation cycle.
*
* Configuration of application is done by picking a unique application instance
* name (e.g., mySimpleApp) and setting its type property to the
@@ -28,37 +28,37 @@
* Group.application setting: Group1.application =
* mySimpleApp.
*
null
@@ -66,52 +66,52 @@ public Application(Application app){
* message.
*/
public abstract Message handle(Message msg, DTNHost host);
-
- /**
+
+ /**
* Called every simulation cycle.
- *
+ *
* @param host The host this application instance is attached to.
*/
public abstract void update(DTNHost host);
-
- /**
+
+ /**
*
* Returns an unique application ID. The application will only receive
* messages with this application ID. If the AppID is set to
* null the application will receive all messages.
*
- * Interface for classes that want to be informed about messages + *
+ * Interface for classes that want to be informed about messages * between hosts. *
- * + * ** Report classes wishing to receive application events should implement this * interface. Note that the application event names are defined by the * applications so any class wishing to interpret them must know the * application. *
- * + * * @author teemuk - * @author mjpitka - */ -public interface ApplicationListener { - - /** + * @author mjpitka + */ +public interface ApplicationListener { + + /** * Application has generated an event. - * + * * @param event Event name. * @param params Additional parameters for the event * @param app Application instance that generated the event. * @param host The host this application instance is running on. - */ + */ public void gotEvent(String event, Object params, Application app, - DTNHost host); -} + DTNHost host); +} diff --git a/core/ArithmeticCondition.java b/core/ArithmeticCondition.java index 448acf046..20ba948cf 100644 --- a/core/ArithmeticCondition.java +++ b/core/ArithmeticCondition.java @@ -1,83 +1,83 @@ -/* - * Copyright 2010 Aalto University, ComNet - * Released under GPLv3. See LICENSE.txt for details. - */ -package core; - -/** - * This class presents a simple arithmetic condition: is value smaller than, - * bigger than, or equal to another value. The condition is given in text - * form, e.g., "< 42", and then different values can be matched against that - * condition. - * @author Ari - */ -public class ArithmeticCondition { - - private static final String VALID_OPERATORS = "><="; - private char operator; - private double number; - - /** - * Creates a new condition based on the given string. - * @param cond The condition string. Must consist of one operator - * ("<", ">", or "=") and one double-precision floating point number. - * @throws SettingsError if the given string is not a valid condition - */ - public ArithmeticCondition(String cond) { - String value; - int multiplier = 1; - - if (cond.length() < 2) { - throw new SettingsError("Invalid condition \"" + cond + "\""); - } - - operator = cond.charAt(0); - value = cond.substring(1); - - /* handle kilo and Mega suffixes for the value */ - if (value.endsWith("k")) { - multiplier = 1000; - } else if (value.endsWith("M")) { - multiplier = 1000000; - } - if (multiplier > 1) { /* remove suffix */ - value = value.substring(0, value.length() - 1); - } - - if (VALID_OPERATORS.indexOf(operator) == -1) { - throw new SettingsError("Invalid operator in condition \"" + cond + - "\" valid operators: " + VALID_OPERATORS); - } - - try { - number = Double.parseDouble(value); - } catch (NumberFormatException e) { - throw new SettingsError("Invalid numeric value in condition \"" + - cond + "\""); - } - - number *= multiplier; - - } - - /** - * Returns true if the given value satisfies "V X N" where V is the given - * value, X is the operator (from the settings), and N is the numeric value - * given after the operator in the settings. - * @param value The value to check - * @return true if the condition holds for the given value, false otherwise - */ - public boolean isTrueFor(double value) { - switch (operator) { - case '<': return value < this.number; - case '>': return value > this.number; - case '=': return value == this.number; // XXX: == for doubles... - default: throw new SettingsError("Invalid operator"); - } - } - - @Override - public String toString() { - return "Condition \"" + operator + " " + number + "\""; - } -} +/* + * Copyright 2010 Aalto University, ComNet + * Released under GPLv3. See LICENSE.txt for details. + */ +package core; + +/** + * This class presents a simple arithmetic condition: is value smaller than, + * bigger than, or equal to another value. The condition is given in text + * form, e.g., "< 42", and then different values can be matched against that + * condition. + * @author Ari + */ +public class ArithmeticCondition { + + private static final String VALID_OPERATORS = "><="; + private char operator; + private double number; + + /** + * Creates a new condition based on the given string. + * @param cond The condition string. Must consist of one operator + * ("<", ">", or "=") and one double-precision floating point number. + * @throws SettingsError if the given string is not a valid condition + */ + public ArithmeticCondition(String cond) { + String value; + int multiplier = 1; + + if (cond.length() < 2) { + throw new SettingsError("Invalid condition \"" + cond + "\""); + } + + operator = cond.charAt(0); + value = cond.substring(1); + + /* handle kilo and Mega suffixes for the value */ + if (value.endsWith("k")) { + multiplier = 1000; + } else if (value.endsWith("M")) { + multiplier = 1000000; + } + if (multiplier > 1) { /* remove suffix */ + value = value.substring(0, value.length() - 1); + } + + if (VALID_OPERATORS.indexOf(operator) == -1) { + throw new SettingsError("Invalid operator in condition \"" + cond + + "\" valid operators: " + VALID_OPERATORS); + } + + try { + number = Double.parseDouble(value); + } catch (NumberFormatException e) { + throw new SettingsError("Invalid numeric value in condition \"" + + cond + "\""); + } + + number *= multiplier; + + } + + /** + * Returns true if the given value satisfies "V X N" where V is the given + * value, X is the operator (from the settings), and N is the numeric value + * given after the operator in the settings. + * @param value The value to check + * @return true if the condition holds for the given value, false otherwise + */ + public boolean isTrueFor(double value) { + switch (operator) { + case '<': return value < this.number; + case '>': return value > this.number; + case '=': return value == this.number; // XXX: == for doubles... + default: throw new SettingsError("Invalid operator"); + } + } + + @Override + public String toString() { + return "Condition \"" + operator + " " + number + "\""; + } +} diff --git a/core/CBRConnection.java b/core/CBRConnection.java index 0db8634bd..9768aaa8f 100644 --- a/core/CBRConnection.java +++ b/core/CBRConnection.java @@ -1,124 +1,124 @@ -/* +/* * Copyright 2010 Aalto University, ComNet - * Released under GPLv3. See LICENSE.txt for details. - */ -package core; - -import routing.MessageRouter; - -/** - * A constant bit-rate connection between two DTN nodes. - */ -public class CBRConnection extends Connection { - private int speed; - private double transferDoneTime; - - /** - * Creates a new connection between nodes and sets the connection - * state to "up". - * @param fromNode The node that initiated the connection - * @param fromInterface The interface that initiated the connection - * @param toNode The node in the other side of the connection - * @param toInterface The interface in the other side of the connection - * @param connectionSpeed Transfer speed of the connection (Bps) when - * the connection is initiated - */ - public CBRConnection(DTNHost fromNode, NetworkInterface fromInterface, - DTNHost toNode, NetworkInterface toInterface, int connectionSpeed) { - super(fromNode, fromInterface, toNode, toInterface); - this.speed = connectionSpeed; - this.transferDoneTime = 0; - - } - - /** - * Sets a message that this connection is currently transferring. If message - * passing is controlled by external events, this method is not needed - * (but then e.g. {@link #finalizeTransfer()} and - * {@link #isMessageTransferred()} will not work either). Only a one message - * at a time can be transferred using one connection. - * @param from The host sending the message - * @param m The message - * @return The value returned by - * {@link MessageRouter#receiveMessage(Message, DTNHost)} - */ - public int startTransfer(DTNHost from, Message m) { - assert this.msgOnFly == null : "Already transferring " + - this.msgOnFly + " from " + this.msgFromNode + " to " + - this.getOtherNode(this.msgFromNode) + ". Can't " + - "start transfer of " + m + " from " + from; - - this.msgFromNode = from; - Message newMessage = m.replicate(); - int retVal = getOtherNode(from).receiveMessage(newMessage, from); - - if (retVal == MessageRouter.RCV_OK) { - this.msgOnFly = newMessage; - this.transferDoneTime = SimClock.getTime() + - (1.0*m.getSize()) / this.speed; - } - - return retVal; - } - - /** - * Aborts the transfer of the currently transferred message. - */ - public void abortTransfer() { - assert msgOnFly != null : "No message to abort at " + msgFromNode; - getOtherNode(msgFromNode).messageAborted(this.msgOnFly.getId(), - msgFromNode,getRemainingByteCount()); - clearMsgOnFly(); - this.transferDoneTime = 0; - } - - /** - * Gets the transferdonetime - */ - public double getTransferDoneTime() { - return transferDoneTime; - } - - /** - * Returns true if the current message transfer is done. - * @return True if the transfer is done, false if not - */ - public boolean isMessageTransferred() { - return getRemainingByteCount() == 0; - } - - /** - * returns the current speed of the connection - */ - public double getSpeed() { - return this.speed; - } - - /** - * Returns the amount of bytes to be transferred before ongoing transfer - * is ready or 0 if there's no ongoing transfer or it has finished - * already - * @return the amount of bytes to be transferred - */ - public int getRemainingByteCount() { - int remaining; - - if (msgOnFly == null) { - return 0; - } - - remaining = (int)((this.transferDoneTime - SimClock.getTime()) - * this.speed); - - return (remaining > 0 ? remaining : 0); - } - - /** - * Returns a String presentation of the connection. - */ - public String toString() { - return super.toString() + (isTransferring() ? - " until " + String.format("%.2f", this.transferDoneTime) : ""); - } - -} + * Released under GPLv3. See LICENSE.txt for details. + */ +package core; + +import routing.MessageRouter; + +/** + * A constant bit-rate connection between two DTN nodes. + */ +public class CBRConnection extends Connection { + private int speed; + private double transferDoneTime; + + /** + * Creates a new connection between nodes and sets the connection + * state to "up". + * @param fromNode The node that initiated the connection + * @param fromInterface The interface that initiated the connection + * @param toNode The node in the other side of the connection + * @param toInterface The interface in the other side of the connection + * @param connectionSpeed Transfer speed of the connection (Bps) when + * the connection is initiated + */ + public CBRConnection(DTNHost fromNode, NetworkInterface fromInterface, + DTNHost toNode, NetworkInterface toInterface, int connectionSpeed) { + super(fromNode, fromInterface, toNode, toInterface); + this.speed = connectionSpeed; + this.transferDoneTime = 0; + + } + + /** + * Sets a message that this connection is currently transferring. If message + * passing is controlled by external events, this method is not needed + * (but then e.g. {@link #finalizeTransfer()} and + * {@link #isMessageTransferred()} will not work either). Only a one message + * at a time can be transferred using one connection. + * @param from The host sending the message + * @param m The message + * @return The value returned by + * {@link MessageRouter#receiveMessage(Message, DTNHost)} + */ + public int startTransfer(DTNHost from, Message m) { + assert this.msgOnFly == null : "Already transferring " + + this.msgOnFly + " from " + this.msgFromNode + " to " + + this.getOtherNode(this.msgFromNode) + ". Can't " + + "start transfer of " + m + " from " + from; + + this.msgFromNode = from; + Message newMessage = m.replicate(); + int retVal = getOtherNode(from).receiveMessage(newMessage, from); + + if (retVal == MessageRouter.RCV_OK) { + this.msgOnFly = newMessage; + this.transferDoneTime = SimClock.getTime() + + (1.0*m.getSize()) / this.speed; + } + + return retVal; + } + + /** + * Aborts the transfer of the currently transferred message. + */ + public void abortTransfer() { + assert msgOnFly != null : "No message to abort at " + msgFromNode; + getOtherNode(msgFromNode).messageAborted(this.msgOnFly.getId(), + msgFromNode,getRemainingByteCount()); + clearMsgOnFly(); + this.transferDoneTime = 0; + } + + /** + * Gets the transferdonetime + */ + public double getTransferDoneTime() { + return transferDoneTime; + } + + /** + * Returns true if the current message transfer is done. + * @return True if the transfer is done, false if not + */ + public boolean isMessageTransferred() { + return getRemainingByteCount() == 0; + } + + /** + * returns the current speed of the connection + */ + public double getSpeed() { + return this.speed; + } + + /** + * Returns the amount of bytes to be transferred before ongoing transfer + * is ready or 0 if there's no ongoing transfer or it has finished + * already + * @return the amount of bytes to be transferred + */ + public int getRemainingByteCount() { + int remaining; + + if (msgOnFly == null) { + return 0; + } + + remaining = (int)((this.transferDoneTime - SimClock.getTime()) + * this.speed); + + return (remaining > 0 ? remaining : 0); + } + + /** + * Returns a String presentation of the connection. + */ + public String toString() { + return super.toString() + (isTransferring() ? + " until " + String.format("%.2f", this.transferDoneTime) : ""); + } + +} diff --git a/core/Connection.java b/core/Connection.java index d6e24d43f..a5092b312 100644 --- a/core/Connection.java +++ b/core/Connection.java @@ -1,6 +1,6 @@ -/* +/* * Copyright 2010 Aalto University, ComNet - * Released under GPLv3. See LICENSE.txt for details. + * Released under GPLv3. See LICENSE.txt for details. */ package core; @@ -29,7 +29,7 @@ public abstract class Connection { * @param toNode The node in the other side of the connection * @param toInterface The interface in the other side of the connection */ - public Connection(DTNHost fromNode, NetworkInterface fromInterface, + public Connection(DTNHost fromNode, NetworkInterface fromInterface, DTNHost toNode, NetworkInterface toInterface) { this.fromNode = fromNode; this.fromInterface = fromInterface; @@ -48,7 +48,7 @@ public boolean isUp() { return this.isUp; } - /** + /** * Returns true if the connections is transferring a message * @return true if the connections is transferring a message */ @@ -56,7 +56,7 @@ public boolean isTransferring() { return this.msgOnFly != null; } - + /** * Returns true if the given node is the initiator of the connection, false * otherwise @@ -66,7 +66,7 @@ public boolean isTransferring() { public boolean isInitiator(DTNHost node) { return node == this.fromNode; } - + /** * Sets the state of the connection. * @param state True if the connection is up, false if not @@ -78,11 +78,11 @@ public void setUpState(boolean state) { /** * Sets a message that this connection is currently transferring. If message * passing is controlled by external events, this method is not needed - * (but then e.g. {@link #finalizeTransfer()} and + * (but then e.g. {@link #finalizeTransfer()} and * {@link #isMessageTransferred()} will not work either). Only a one message * at a time can be transferred using one connection. * @param m The message - * @return The value returned by + * @return The value returned by * {@link MessageRouter#receiveMessage(Message, DTNHost)} */ public abstract int startTransfer(DTNHost from, Message m); @@ -97,7 +97,7 @@ public void setUpState(boolean state) { * Aborts the transfer of the currently transferred message. */ public void abortTransfer() { - assert msgOnFly != null : "No message to abort at " + msgFromNode; + assert msgOnFly != null : "No message to abort at " + msgFromNode; int bytesRemaining = getRemainingByteCount(); this.bytesTransferred += msgOnFly.getSize() - bytesRemaining; @@ -105,7 +105,7 @@ public void abortTransfer() { getOtherNode(msgFromNode).messageAborted(this.msgOnFly.getId(), msgFromNode, bytesRemaining); clearMsgOnFly(); - } + } /** * Returns the amount of bytes to be transferred before ongoing transfer @@ -121,7 +121,7 @@ public void abortTransfer() { */ protected void clearMsgOnFly() { this.msgOnFly = null; - this.msgFromNode = null; + this.msgFromNode = null; } /** @@ -133,7 +133,7 @@ protected void clearMsgOnFly() { public void finalizeTransfer() { assert this.msgOnFly != null : "Nothing to finalize in " + this; assert msgFromNode != null : "msgFromNode is not set"; - + this.bytesTransferred += msgOnFly.getSize(); getOtherNode(msgFromNode).messageTransferred(this.msgOnFly.getId(), @@ -142,7 +142,7 @@ public void finalizeTransfer() { } /** - * Returns true if the current message transfer is done + * Returns true if the current message transfer is done * @return True if the transfer is done, false if not */ public abstract boolean isMessageTransferred(); @@ -153,21 +153,21 @@ public void finalizeTransfer() { * @return true if the connection is ready to transfer a message */ public boolean isReadyForTransfer() { - return this.isUp && this.msgOnFly == null; + return this.isUp && this.msgOnFly == null; } /** * Gets the message that this connection is currently transferring. * @return The message or null if no message is being transferred - */ + */ public Message getMessage() { return this.msgOnFly; } - /** + /** * Gets the current connection speed */ - public abstract double getSpeed(); + public abstract double getSpeed(); /** * Returns the total amount of bytes this connection has transferred so far @@ -182,7 +182,7 @@ public int getTotalBytesTransferred() { return this.bytesTransferred + this.msgOnFly.getSize(); } else { - return this.bytesTransferred + + return this.bytesTransferred + (msgOnFly.getSize() - getRemainingByteCount()); } } @@ -221,8 +221,8 @@ public NetworkInterface getOtherInterface(NetworkInterface i) { */ public String toString() { return fromNode + "<->" + toNode + " (" + getSpeed()/1000 + " kBps) is " + - (isUp() ? "up":"down") + - (isTransferring() ? " transferring " + this.msgOnFly + + (isUp() ? "up":"down") + + (isTransferring() ? " transferring " + this.msgOnFly + " from " + this.msgFromNode : ""); } diff --git a/core/ConnectionListener.java b/core/ConnectionListener.java index 210978f2e..752fedf17 100644 --- a/core/ConnectionListener.java +++ b/core/ConnectionListener.java @@ -1,27 +1,27 @@ -/* +/* * Copyright 2010 Aalto University, ComNet - * Released under GPLv3. See LICENSE.txt for details. + * Released under GPLv3. See LICENSE.txt for details. */ -package core; - -/** - * Interface for classes that want to be informed about connections - * between hosts. - */ -public interface ConnectionListener { - - /** - * Method is called when two hosts are connected. - * @param host1 Host that initiated the connection - * @param host2 Host that was connected to - */ - public void hostsConnected(DTNHost host1, DTNHost host2); - - /** - * Method is called when connection between hosts is disconnected. - * @param host1 Host that initiated the disconnection - * @param host2 Host at the other end of the connection - */ - public void hostsDisconnected(DTNHost host1, DTNHost host2); - -} +package core; + +/** + * Interface for classes that want to be informed about connections + * between hosts. + */ +public interface ConnectionListener { + + /** + * Method is called when two hosts are connected. + * @param host1 Host that initiated the connection + * @param host2 Host that was connected to + */ + public void hostsConnected(DTNHost host1, DTNHost host2); + + /** + * Method is called when connection between hosts is disconnected. + * @param host1 Host that initiated the disconnection + * @param host2 Host at the other end of the connection + */ + public void hostsDisconnected(DTNHost host1, DTNHost host2); + +} diff --git a/core/Coord.java b/core/Coord.java index 002801c57..45b22835e 100644 --- a/core/Coord.java +++ b/core/Coord.java @@ -1,156 +1,156 @@ -/* +/* * Copyright 2010 Aalto University, ComNet - * Released under GPLv3. See LICENSE.txt for details. + * Released under GPLv3. See LICENSE.txt for details. */ -package core; - -/** - * Class to hold 2D coordinates and perform simple arithmetics and - * transformations - */ -public class Coord implements Cloneable, ComparableDTN2.configFile setting.
@@ -65,16 +65,16 @@ public static void setup(World world) {
String[] attrs;
int nodeID, dtnd_port, console_port;
String nodeEID, dtnd_host;
-
+
DTN2Manager.CLAs = new HashMapDTN2Reporter object used to pass messages from ONE
* to dtnd.
@@ -154,15 +154,15 @@ public static void setup(World world) {
public static void setReporter(DTN2Reporter reporter) {
DTN2Manager.reporter = reporter;
}
-
+
/**
* Returns reference to the DTN2Reporter object.
* @return reference to the active DTN2Reporter object
- */
+ */
public static DTN2Reporter getReporter() {
return DTN2Manager.reporter;
}
-
+
/**
* Sets the DTN2Events object.
* @param events the active events object to use
@@ -170,15 +170,15 @@ public static DTN2Reporter getReporter() {
public static void setEvents(DTN2Events events) {
DTN2Manager.events = events;
}
-
- /**
+
+ /**
* Returns the DTN2Events object.
* @return the currently active events object.
*/
public static DTN2Events getEvents() {
return DTN2Manager.events;
}
-
+
/**
* Returns the ECL parser associated with the host.
* @param host the host who's parser to return
@@ -187,8 +187,8 @@ public static DTN2Events getEvents() {
public static CLAParser getParser(DTNHost host) {
return DTN2Manager.CLAs.get(host);
}
-
- /**
+
+ /**
* Returns a Collection of DTNHost
* objects corresponding to the given EID.
* @param EID EID of the host
@@ -201,7 +201,7 @@ public static Collectioncore.SimClock
*/
public static void registerForReset(String className) {
Class c = null;
@@ -146,19 +146,19 @@ public static void registerForReset(String className) {
c = Class.forName(className);
c.getMethod(RESET_METHOD_NAME);
} catch (ClassNotFoundException e) {
- System.err.println("Can't register class " + className +
+ System.err.println("Can't register class " + className +
" for resetting; class not found");
System.exit(-1);
-
+
}
catch (NoSuchMethodException e) {
- System.err.println("Can't register class " + className +
+ System.err.println("Can't register class " + className +
" for resetting; class doesn't contain resetting method");
System.exit(-1);
}
resetList.add(c);
}
-
+
/**
* Resets all registered classes.
*/
@@ -174,18 +174,18 @@ private static void resetForNextRun() {
}
}
}
-
+
/**
- * Parses the number of runs, and an optional starting run index, from a
+ * Parses the number of runs, and an optional starting run index, from a
* command line argument
* @param arg The argument to parse
* @return The first and (last_run_index - 1) in an array
*/
private static int[] parseNrofRuns(String arg) {
- int val[] = {0,1};
+ int val[] = {0,1};
try {
if (arg.contains(RANGE_DELIMETER)) {
- val[0] = Integer.parseInt(arg.substring(0,
+ val[0] = Integer.parseInt(arg.substring(0,
arg.indexOf(RANGE_DELIMETER))) - 1;
val[1] = Integer.parseInt(arg.substring(arg.
indexOf(RANGE_DELIMETER) + 1, arg.length()));
@@ -193,29 +193,29 @@ private static int[] parseNrofRuns(String arg) {
else {
val[0] = 0;
val[1] = Integer.parseInt(arg);
- }
+ }
} catch (NumberFormatException e) {
System.err.println("Invalid argument '" + arg + "' for" +
" number of runs");
- System.err.println("The argument must be either a single value, " +
- "or a range of values (e.g., '2:5'). Note that this " +
+ System.err.println("The argument must be either a single value, " +
+ "or a range of values (e.g., '2:5'). Note that this " +
"option has changed in version 1.3.");
System.exit(-1);
}
-
+
if (val[0] < 0) {
System.err.println("Starting run value can't be smaller than 1");
System.exit(-1);
}
if (val[0] >= val[1]) {
- System.err.println("Starting run value can't be bigger than the " +
+ System.err.println("Starting run value can't be bigger than the " +
"last run value");
- System.exit(-1);
+ System.exit(-1);
}
-
+
return val;
}
-
+
/**
* Prints text to stdout
* @param txt Text to print
diff --git a/core/Debug.java b/core/Debug.java
index 722b79fde..b0546a1f9 100644
--- a/core/Debug.java
+++ b/core/Debug.java
@@ -1,115 +1,115 @@
-/*
+/*
* Copyright 2010 Aalto University, ComNet
- * Released under GPLv3. See LICENSE.txt for details.
+ * Released under GPLv3. See LICENSE.txt for details.
*/
-package core;
-
+package core;
+
import java.io.PrintStream;
-
-/**
- * Debugging info printer with time stamping. This class is not to be actively
- * used but convenient for temporary debugging.
- */
-public class Debug {
- private static PrintStream out = System.out;
- private static int debugLevel = 0;
- private static long timingStart = -1;
- private static String timingCause;
-
- /**
- * Sets the current debug level (smaller level -> more messages)
- * @param level The level to set
- */
- public void setDebugLevel(int level) {
- debugLevel = level;
- }
-
- /**
- * Sets print stream of debug output.
- * @param outStrm The stream
- */
- public void setPrintStream(PrintStream outStrm) {
- out = outStrm;
- }
-
- /**
- * Prints text to output with level 0
- * @param txt text to print
- */
- public static void p(String txt) {
- p(txt, 0, false);
- }
-
- /**
- * Prints text to output given with level
- * @param level The debug level
- * @param txt text to print
- */
- public static void p(String txt, int level) {
- p(txt,level, false);
- }
-
-
- /**
- * Debug print with a timestamp
- * @param txt Text to print
- * @param level Debug level
- */
- public static void pt(String txt, int level) {
- p(txt,level,true);
- }
-
- /**
- * Debug print with a timestamp and 0 level
- * @param txt Text to print
- */
- public static void pt(String txt) {
- p(txt,0,true);
- }
-
- /**
- * Print text to debug output.
- * @param txt The text to print
- * @param level The debug level (only messages with level >= debugLevel
- * are printed)
- * @param timestamp If true, text is (sim)timestamped
- */
- public static void p(String txt, int level, boolean timestamp) {
- String time = "";
- int simTime = SimClock.getIntTime();
- if (level < debugLevel) {
- return;
- }
-
- if (timestamp) {
- time = "[@"+simTime+"]";
- }
- out.println("D" + time + ": " + txt);
- }
-
- /**
- * Start timing an action.
- * @see #doneTiming()
- */
- public static void startTiming(String cause) {
- if (timingStart != -1) {
- doneTiming();
- }
- timingCause = cause;
- timingStart = System.currentTimeMillis();
- }
-
- /**
- * End timing an action. Information how long the action took is
- * printed to debug stream.
- * @see #startTiming(String)
- */
- public static void doneTiming() {
- long end = System.currentTimeMillis();
- long diff = end-timingStart;
- if (end-timingStart > 0)
- pt(timingCause + " took "+ diff/1000.0 + "s" );
-
- timingStart = -1;
- }
-}
+
+/**
+ * Debugging info printer with time stamping. This class is not to be actively
+ * used but convenient for temporary debugging.
+ */
+public class Debug {
+ private static PrintStream out = System.out;
+ private static int debugLevel = 0;
+ private static long timingStart = -1;
+ private static String timingCause;
+
+ /**
+ * Sets the current debug level (smaller level -> more messages)
+ * @param level The level to set
+ */
+ public void setDebugLevel(int level) {
+ debugLevel = level;
+ }
+
+ /**
+ * Sets print stream of debug output.
+ * @param outStrm The stream
+ */
+ public void setPrintStream(PrintStream outStrm) {
+ out = outStrm;
+ }
+
+ /**
+ * Prints text to output with level 0
+ * @param txt text to print
+ */
+ public static void p(String txt) {
+ p(txt, 0, false);
+ }
+
+ /**
+ * Prints text to output given with level
+ * @param level The debug level
+ * @param txt text to print
+ */
+ public static void p(String txt, int level) {
+ p(txt,level, false);
+ }
+
+
+ /**
+ * Debug print with a timestamp
+ * @param txt Text to print
+ * @param level Debug level
+ */
+ public static void pt(String txt, int level) {
+ p(txt,level,true);
+ }
+
+ /**
+ * Debug print with a timestamp and 0 level
+ * @param txt Text to print
+ */
+ public static void pt(String txt) {
+ p(txt,0,true);
+ }
+
+ /**
+ * Print text to debug output.
+ * @param txt The text to print
+ * @param level The debug level (only messages with level >= debugLevel
+ * are printed)
+ * @param timestamp If true, text is (sim)timestamped
+ */
+ public static void p(String txt, int level, boolean timestamp) {
+ String time = "";
+ int simTime = SimClock.getIntTime();
+ if (level < debugLevel) {
+ return;
+ }
+
+ if (timestamp) {
+ time = "[@"+simTime+"]";
+ }
+ out.println("D" + time + ": " + txt);
+ }
+
+ /**
+ * Start timing an action.
+ * @see #doneTiming()
+ */
+ public static void startTiming(String cause) {
+ if (timingStart != -1) {
+ doneTiming();
+ }
+ timingCause = cause;
+ timingStart = System.currentTimeMillis();
+ }
+
+ /**
+ * End timing an action. Information how long the action took is
+ * printed to debug stream.
+ * @see #startTiming(String)
+ */
+ public static void doneTiming() {
+ long end = System.currentTimeMillis();
+ long diff = end-timingStart;
+ if (end-timingStart > 0)
+ pt(timingCause + " took "+ diff/1000.0 + "s" );
+
+ timingStart = -1;
+ }
+}
diff --git a/core/Message.java b/core/Message.java
index 60b48b75e..d037b890b 100644
--- a/core/Message.java
+++ b/core/Message.java
@@ -1,268 +1,268 @@
-/*
+/*
* Copyright 2010 Aalto University, ComNet
- * Released under GPLv3. See LICENSE.txt for details.
+ * Released under GPLv3. See LICENSE.txt for details.
*/
-package core;
-
+package core;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-/**
- * A message that is created at a node or passed between nodes.
- */
-public class Message implements ComparableAll settings are key-value pairs. For parsing details see - * {@link java.util.Properties#getProperty(String)}. Value can be a single - * value or comma separated list of values. With CSV values, CSV methods - * must be used (e.g. {@link #getCsvInts(String, int)}). Setting value should - * not start and end with a bracket since those are reserved for run-specific - * values (see {@link #setRunIndex(int)}). In file paths directory separator - * should always be forward slash ("/"). - *
- */ -public class Settings { - /** properties object where the setting files are read into */ - protected static Properties props; - /** file name of the default settings file ({@value}) */ + +/** + * Interface for simulation settings stored in setting file(s). Settings + * class should be initialized before using (with {@link #init(String)}). If + * Settings isn't initialized, only settings in {@link #DEF_SETTINGS_FILE} + * are read. Normally, after initialization, settings in the given file can + * override any settings defined in the default settings file and/or define + * new settings. + *All settings are key-value pairs. For parsing details see + * {@link java.util.Properties#getProperty(String)}. Value can be a single + * value or comma separated list of values. With CSV values, CSV methods + * must be used (e.g. {@link #getCsvInts(String, int)}). Setting value should + * not start and end with a bracket since those are reserved for run-specific + * values (see {@link #setRunIndex(int)}). In file paths directory separator + * should always be forward slash ("/"). + *
+ */ +public class Settings { + /** properties object where the setting files are read into */ + protected static Properties props; + /** file name of the default settings file ({@value}) */ public static final String DEF_SETTINGS_FILE ="default_settings.txt"; - - /** + + /** * Setting to define the file name where all read settings are written - * ({@value}. If set to an empty string, standard output is used. - * By default setting are not written anywhere. + * ({@value}. If set to an empty string, standard output is used. + * By default setting are not written anywhere. */ - public static final String SETTING_OUTPUT_S = "Settings.output"; - - /** delimiter for requested values in strings ({@value}) - * @see #valueFillString(String) */ + public static final String SETTING_OUTPUT_S = "Settings.output"; + + /** delimiter for requested values in strings ({@value}) + * @see #valueFillString(String) */ public static final String FILL_DELIMITER = "%%"; - + /** Stream where all read settings are written to */ private static PrintStream out = null; - private static Set[settingFor1stRun ; settingFor2ndRun ; SettingFor3rdRun]
- * runIndex % arrayLength).
- * To disable whole run-index-thing, set index to value smaller than
- * zero (e.g. -1). When disabled, run-arrays are returned as normal values,
- * including the brackets.
- * @param index The run index to use for subsequent settings calls, or
- * -1 to disable run indexing
- */
- public static void setRunIndex(int index) {
+ private static Set[settingFor1stRun ; settingFor2ndRun ; SettingFor3rdRun]
+ * runIndex % arrayLength).
+ * To disable whole run-index-thing, set index to value smaller than
+ * zero (e.g. -1). When disabled, run-arrays are returned as normal values,
+ * including the brackets.
+ * @param index The run index to use for subsequent settings calls, or
+ * -1 to disable run indexing
+ */
+ public static void setRunIndex(int index) {
runIndex = index;
- writtenSettings.clear();
+ writtenSettings.clear();
}
-
+
/**
- * Checks that the given integer array contains a valid range. I.e.,
- * the length of the array must be two and
+ * Checks that the given integer array contains a valid range. I.e.,
+ * the length of the array must be two and
* first_value <= second_value.
* @param range The range array
* @param sname Name of the setting (for error messages)
* @throws SettingsError If the given array didn't qualify as a range
*/
- public void assertValidRange(int range[], String sname)
+ public void assertValidRange(int range[], String sname)
throws SettingsError {
if (range.length != 2) {
- throw new SettingsError("Range setting " +
- getFullPropertyName(sname) +
+ throw new SettingsError("Range setting " +
+ getFullPropertyName(sname) +
" should contain only two comma separated integer values");
}
if (range[0] > range[1]) {
- throw new SettingsError("Range setting's " +
- getFullPropertyName(sname) +
+ throw new SettingsError("Range setting's " +
+ getFullPropertyName(sname) +
" first value should be smaller or equal to second value");
}
- }
-
+ }
+
/**
* Makes sure that the given settings value is positive
* @param value Value to check
@@ -133,21 +133,21 @@ public void assertValidRange(int range[], String sname)
*/
public void ensurePositiveValue(double value, String settingName) {
if (value < 0) {
- throw new SettingsError("Negative value (" + value +
+ throw new SettingsError("Negative value (" + value +
") not accepted for setting " + settingName);
}
}
-
- /**
- * Sets the namespace to something else than the current namespace.
- * This change can be reverted using {@link #restoreNameSpace()}
- * @param namespace The new namespace
- */
- public void setNameSpace(String namespace) {
- this.oldNamespaces.push(this.namespace);
- this.namespace = namespace;
+
+ /**
+ * Sets the namespace to something else than the current namespace.
+ * This change can be reverted using {@link #restoreNameSpace()}
+ * @param namespace The new namespace
+ */
+ public void setNameSpace(String namespace) {
+ this.oldNamespaces.push(this.namespace);
+ this.namespace = namespace;
}
-
+
/**
* Appends the given namespace to the the current namespace,
* for both the primary and secondary namespace .
@@ -161,108 +161,108 @@ public void setSubNameSpace(String namespace) {
this.secondaryNamespaces.push(this.secondaryNamespace);
this.secondaryNamespace = this.secondaryNamespace + "." + namespace;
}
-
- /**
- * Returns full (namespace prefixed) property name for a setting.
- * @param setting The name of the setting
- * @return The setting name prefixed with fully qualified name of the
- * namespace where the requested setting would be retrieved from or null
- * if that setting is not found from any of the current namespace(s)
- */
- public String getFullPropertyName(String setting) {
- if (!contains(setting)) {
- return null;
- }
-
- if (props.getProperty(getFullPropertyName(setting, false)) != null) {
- return getFullPropertyName(setting, false);
- }
-
- // not found from primary, but Settings contains -> must be from 2ndary
- else return getFullPropertyName(setting, true);
- }
-
- /**
+
+ /**
+ * Returns full (namespace prefixed) property name for a setting.
+ * @param setting The name of the setting
+ * @return The setting name prefixed with fully qualified name of the
+ * namespace where the requested setting would be retrieved from or null
+ * if that setting is not found from any of the current namespace(s)
+ */
+ public String getFullPropertyName(String setting) {
+ if (!contains(setting)) {
+ return null;
+ }
+
+ if (props.getProperty(getFullPropertyName(setting, false)) != null) {
+ return getFullPropertyName(setting, false);
+ }
+
+ // not found from primary, but Settings contains -> must be from 2ndary
+ else return getFullPropertyName(setting, true);
+ }
+
+ /**
* Returns the namespace of the settings object
* @return the namespace of the settings object
*/
public String getNameSpace() {
return this.namespace;
}
-
- /**
+
+ /**
* Returns the secondary namespace of the settings object
* @return the secondary namespace of the settings object
*/
public String getSecondaryNameSpace() {
return this.secondaryNamespace;
}
-
- /**
- * Sets a secondary namespace where a setting is searched from if it
- * isn't found from the primary namespace. Secondary namespace can
- * be used e.g. as a "default" space where the settings are looked from
- * if no specific setting is set.
- * This change can be reverted using {@link #restoreSecondaryNamespace()}
- * @param namespace The new secondary namespace or null if secondary
- * namespace is not used (default behavior)
- */
- public void setSecondaryNamespace(String namespace) {
- this.secondaryNamespaces.push(this.secondaryNamespace);
- this.secondaryNamespace = namespace;
- }
-
- /**
- * Restores the namespace that was in use before a call to setNameSpace
- * @see #setNameSpace(String)
- */
- public void restoreNameSpace() {
- this.namespace = this.oldNamespaces.pop();
- }
-
- /**
- * Restores the secondary namespace that was in use before a call to
- * setSecondaryNameSpace
- * @see #setSecondaryNamespace(String)
- */
- public void restoreSecondaryNamespace() {
- this.secondaryNamespace = this.secondaryNamespaces.pop();
- }
-
- /**
- * Reverts the change made with {@link #setSubNameSpace(String)}, i.e.,
+
+ /**
+ * Sets a secondary namespace where a setting is searched from if it
+ * isn't found from the primary namespace. Secondary namespace can
+ * be used e.g. as a "default" space where the settings are looked from
+ * if no specific setting is set.
+ * This change can be reverted using {@link #restoreSecondaryNamespace()}
+ * @param namespace The new secondary namespace or null if secondary
+ * namespace is not used (default behavior)
+ */
+ public void setSecondaryNamespace(String namespace) {
+ this.secondaryNamespaces.push(this.secondaryNamespace);
+ this.secondaryNamespace = namespace;
+ }
+
+ /**
+ * Restores the namespace that was in use before a call to setNameSpace
+ * @see #setNameSpace(String)
+ */
+ public void restoreNameSpace() {
+ this.namespace = this.oldNamespaces.pop();
+ }
+
+ /**
+ * Restores the secondary namespace that was in use before a call to
+ * setSecondaryNameSpace
+ * @see #setSecondaryNamespace(String)
+ */
+ public void restoreSecondaryNamespace() {
+ this.secondaryNamespace = this.secondaryNamespaces.pop();
+ }
+
+ /**
+ * Reverts the change made with {@link #setSubNameSpace(String)}, i.e.,
* restores both the primary and secondary namespace.
*/
public void restoreSubNameSpace() {
restoreNameSpace();
restoreSecondaryNamespace();
- }
-
- /**
- * Initializes the settings all Settings objects will use. This should be
- * called before any setting requests. Subsequent calls replace all
- * old settings and then Settings contains only the new settings.
- * The file {@link #DEF_SETTINGS_FILE}, if exists, is always read.
- * @param propFile Path to the property file where additional settings
- * are read from or null if no additional settings files are needed.
- * @throws SettingsError If loading the settings file(s) didn't succeed
- */
- public static void init(String propFile) throws SettingsError {
+ }
+
+ /**
+ * Initializes the settings all Settings objects will use. This should be
+ * called before any setting requests. Subsequent calls replace all
+ * old settings and then Settings contains only the new settings.
+ * The file {@link #DEF_SETTINGS_FILE}, if exists, is always read.
+ * @param propFile Path to the property file where additional settings
+ * are read from or null if no additional settings files are needed.
+ * @throws SettingsError If loading the settings file(s) didn't succeed
+ */
+ public static void init(String propFile) throws SettingsError {
String outFile;
- try {
+ try {
if (new File(DEF_SETTINGS_FILE).exists()) {
- Properties defProperties = new Properties();
- defProperties.load(new FileInputStream(DEF_SETTINGS_FILE));
+ Properties defProperties = new Properties();
+ defProperties.load(new FileInputStream(DEF_SETTINGS_FILE));
props = new Properties(defProperties);
}
else {
props = new Properties();
- }
- if (propFile != null) {
- props.load(new FileInputStream(propFile));
- }
- } catch (IOException e) {
- throw new SettingsError(e);
+ }
+ if (propFile != null) {
+ props.load(new FileInputStream(propFile));
+ }
+ } catch (IOException e) {
+ throw new SettingsError(e);
}
outFile = props.getProperty(SETTING_OUTPUT_S);
@@ -278,8 +278,8 @@ public static void init(String propFile) throws SettingsError {
}
}
}
- }
-
+ }
+
/**
* Reads another settings file and adds the key-value pairs to the current
* settings overriding any values that already existed with the same keys.
@@ -294,7 +294,7 @@ public static void addSettings(String propFile) throws SettingsError {
throw new SettingsError(e);
}
}
-
+
/**
* Writes the given setting string to the settings output (if any)
* @param setting The string to write
@@ -308,87 +308,87 @@ private static void outputSetting(String setting) {
writtenSettings.add(setting);
}
}
-
- /**
- * Returns true if a setting with defined name (in the current namespace
- * or secondary namespace if such is set) exists and has some value
- * (not just white space)
- * @param name Name of the setting to check
- * @return True if the setting exists, false if not
- */
- public boolean contains(String name) {
- try {
- String value = getSetting(name);
- if (value == null) {
- return false;
- }
-
- else return value.trim().length() > 0;
- }
- catch (SettingsError e) {
- return false; // didn't find the setting
- }
- }
-
- /**
- * Returns full (namespace prefixed) property name for setting.
- * @param name Name of the settings
- * @param secondary If true, the secondary namespace is used.
- * @return full (prefixed with current namespace) property name for setting
- */
- private String getFullPropertyName(String name, boolean secondary) {
- String usedNamespace = (secondary ? secondaryNamespace : namespace);
-
- if (usedNamespace != null) {
- return usedNamespace + "." + name;
- }
- else {
- return name;
- }
- }
-
- /**
- * Returns a String-valued setting. Setting is first looked from the
- * namespace that is set (if any) and then from the secondary namespace
- * (if any). All other getters use this method as their first step too
- * (so all getters may throw SettingsError and look from both namespaces).
- * @param name Name of the setting to get
- * @return The contents of the setting in a String
- * @throws SettingsError if the setting is not found from either one of
- * the namespaces
- */
+
+ /**
+ * Returns true if a setting with defined name (in the current namespace
+ * or secondary namespace if such is set) exists and has some value
+ * (not just white space)
+ * @param name Name of the setting to check
+ * @return True if the setting exists, false if not
+ */
+ public boolean contains(String name) {
+ try {
+ String value = getSetting(name);
+ if (value == null) {
+ return false;
+ }
+
+ else return value.trim().length() > 0;
+ }
+ catch (SettingsError e) {
+ return false; // didn't find the setting
+ }
+ }
+
+ /**
+ * Returns full (namespace prefixed) property name for setting.
+ * @param name Name of the settings
+ * @param secondary If true, the secondary namespace is used.
+ * @return full (prefixed with current namespace) property name for setting
+ */
+ private String getFullPropertyName(String name, boolean secondary) {
+ String usedNamespace = (secondary ? secondaryNamespace : namespace);
+
+ if (usedNamespace != null) {
+ return usedNamespace + "." + name;
+ }
+ else {
+ return name;
+ }
+ }
+
+ /**
+ * Returns a String-valued setting. Setting is first looked from the
+ * namespace that is set (if any) and then from the secondary namespace
+ * (if any). All other getters use this method as their first step too
+ * (so all getters may throw SettingsError and look from both namespaces).
+ * @param name Name of the setting to get
+ * @return The contents of the setting in a String
+ * @throws SettingsError if the setting is not found from either one of
+ * the namespaces
+ */
public String getSetting(String name) {
- String fullPropName;
- if (props == null) {
- init(null);
- }
- fullPropName = getFullPropertyName(name, false);
- String value = props.getProperty(fullPropName);
-
- if (value != null) { // found value, check if run setting can be parsed
- value = parseRunSetting(value.trim());
- }
-
- if ((value == null || value.length() == 0) &&
- this.secondaryNamespace != null) {
+ String fullPropName;
+ if (props == null) {
+ init(null);
+ }
+ fullPropName = getFullPropertyName(name, false);
+ String value = props.getProperty(fullPropName);
+
+ if (value != null) { // found value, check if run setting can be parsed
+ value = parseRunSetting(value.trim());
+ }
+
+ if ((value == null || value.length() == 0) &&
+ this.secondaryNamespace != null) {
// try secondary namespace if the value wasn't found from primary
- fullPropName = getFullPropertyName(name, true);
- value = props.getProperty(fullPropName);
-
- if (value != null) {
- value = parseRunSetting(value.trim());
- }
- }
-
+ fullPropName = getFullPropertyName(name, true);
+ value = props.getProperty(fullPropName);
+
+ if (value != null) {
+ value = parseRunSetting(value.trim());
+ }
+ }
+
if (value == null || value.length() == 0) {
- throw new SettingsError("Can't find setting " +
+ throw new SettingsError("Can't find setting " +
getPropertyNamesString(name));
- }
-
- outputSetting(fullPropName + " = " + value);
- return value;
- }
-
+ }
+
+ outputSetting(fullPropName + " = " + value);
+ return value;
+ }
+
/**
* Returns the given setting if it exists, or defaultValue if the setting
* does not exist
@@ -404,61 +404,61 @@ public String getSetting(String name, String defaultValue) {
return getSetting(name);
}
}
-
- /**
- * Parses run-specific settings from a String value
- * @param value The String to parse
- * @return The runIndex % arrayLength'th value of the run array
- */
- private static String parseRunSetting(String value) {
- final String RUN_ARRAY_START = "[";
- final String RUN_ARRAY_END = "]";
- final String RUN_ARRAY_DELIM = ";";
- final int MIN_LENGTH = 3; // minimum run is one value. e.g. "[v]"
-
- if (!value.startsWith(RUN_ARRAY_START) ||
- !value.endsWith(RUN_ARRAY_END) ||
- runIndex < 0 ||
- value.length() < MIN_LENGTH) {
- return value; // standard format setting -> return
- }
-
- value = value.substring(1,value.length()-1); // remove brackets
- String[] valueArr = value.split(RUN_ARRAY_DELIM);
- int arrIndex = runIndex % valueArr.length;
- value = valueArr[arrIndex].trim();
-
- return value;
- }
-
- /**
- * Returns the setting name appended to namespace name(s) on a String
- * (for error messages)
- * @param name Name of the setting
- * @return the setting name appended to namespace name(s) on a String
- */
- private String getPropertyNamesString(String name) {
- if (this.secondaryNamespace != null) {
- return "'"+ this.secondaryNamespace + "." + name + "' nor '" +
- this.namespace + "." + name + "'";
- }
- else if (this.namespace != null){
- return "'" + this.namespace + "." + name + "'";
- }
- else {
- return "'" + name + "'";
- }
- }
-
- /**
- * Returns a double-valued setting
- * @param name Name of the setting to get
- * @return Value of the setting as a double
- */
- public double getDouble(String name) {
- return parseDouble(getSetting(name), name);
- }
-
+
+ /**
+ * Parses run-specific settings from a String value
+ * @param value The String to parse
+ * @return The runIndex % arrayLength'th value of the run array
+ */
+ private static String parseRunSetting(String value) {
+ final String RUN_ARRAY_START = "[";
+ final String RUN_ARRAY_END = "]";
+ final String RUN_ARRAY_DELIM = ";";
+ final int MIN_LENGTH = 3; // minimum run is one value. e.g. "[v]"
+
+ if (!value.startsWith(RUN_ARRAY_START) ||
+ !value.endsWith(RUN_ARRAY_END) ||
+ runIndex < 0 ||
+ value.length() < MIN_LENGTH) {
+ return value; // standard format setting -> return
+ }
+
+ value = value.substring(1,value.length()-1); // remove brackets
+ String[] valueArr = value.split(RUN_ARRAY_DELIM);
+ int arrIndex = runIndex % valueArr.length;
+ value = valueArr[arrIndex].trim();
+
+ return value;
+ }
+
+ /**
+ * Returns the setting name appended to namespace name(s) on a String
+ * (for error messages)
+ * @param name Name of the setting
+ * @return the setting name appended to namespace name(s) on a String
+ */
+ private String getPropertyNamesString(String name) {
+ if (this.secondaryNamespace != null) {
+ return "'"+ this.secondaryNamespace + "." + name + "' nor '" +
+ this.namespace + "." + name + "'";
+ }
+ else if (this.namespace != null){
+ return "'" + this.namespace + "." + name + "'";
+ }
+ else {
+ return "'" + name + "'";
+ }
+ }
+
+ /**
+ * Returns a double-valued setting
+ * @param name Name of the setting to get
+ * @return Value of the setting as a double
+ */
+ public double getDouble(String name) {
+ return parseDouble(getSetting(name), name);
+ }
+
/**
* Returns a double-valued setting, or the default value if the given
* setting does not exist
@@ -469,142 +469,142 @@ public double getDouble(String name) {
public double getDouble(String name, double defaultValue) {
return parseDouble(getSetting(name, ""+defaultValue), name);
}
-
- /**
- * Parses a double value from a String valued setting. Supports
- * kilo (k), mega (M) and giga (G) suffixes.
- * @param value String value to parse
- * @param setting The setting where this value was from (for error msgs)
- * @return The value as a double
- * @throws SettingsError if the value wasn't a numeric value
- * (or the suffix wasn't recognized)
- */
- private double parseDouble(String value, String setting) {
- double number;
- int multiplier = 1;
-
- if (value.endsWith("k")) {
- multiplier = 1000;
- }
- else if (value.endsWith("M")) {
- multiplier = 1000000;
- }
- else if (value.endsWith("G")) {
- multiplier = 1000000000;
- }
-
- if (multiplier > 1) { // take the suffix away before parsing
- value = value.substring(0,value.length()-1);
- }
-
- try {
- number = Double.parseDouble(value) * multiplier;
- } catch (NumberFormatException e) {
- throw new SettingsError("Invalid numeric setting '" + value +
- "' for '" + setting +"'\n" + e.getMessage());
- }
- return number;
- }
-
- /**
- * Returns a CSV setting. Value part of the setting must be a list of
- * comma separated values. Whitespace between values is trimmed away.
- * @param name Name of the setting
- * @return Array of values that were comma-separated
- * @throws SettingsError if something went wrong with reading
- */
- public String[] getCsvSetting(String name) {
- ArrayList-time before
- * calling this method.
- * @param time The total time (seconds) to move
- */
- public void warmupMovementModel(double time) {
- if (time <= 0) {
- return;
- }
-
- while(SimClock.getTime() < -updateInterval) {
- moveHosts(updateInterval);
- simClock.advance(updateInterval);
- }
-
- double finalStep = -SimClock.getTime();
-
- moveHosts(finalStep);
- simClock.setTime(0);
- }
+ }
+ }
+
+ /**
+ * Moves hosts in the world for the time given time initialize host
+ * positions properly. SimClock must be set to -time before
+ * calling this method.
+ * @param time The total time (seconds) to move
+ */
+ public void warmupMovementModel(double time) {
+ if (time <= 0) {
+ return;
+ }
+
+ while(SimClock.getTime() < -updateInterval) {
+ moveHosts(updateInterval);
+ simClock.advance(updateInterval);
+ }
+
+ double finalStep = -SimClock.getTime();
+
+ moveHosts(finalStep);
+ simClock.setTime(0);
+ }
/**
- * Goes through all event Queues and sets the
+ * Goes through all event Queues and sets the
* event queue that has the next event.
*/
public void setNextEventQueue() {
@@ -133,7 +133,7 @@ public void setNextEventQueue() {
/* find the queue that has the next event */
for (EventQueue eq : eventQueues) {
if (eq.nextEventsTime() < earliest){
- nextQueue = eq;
+ nextQueue = eq;
earliest = eq.nextEventsTime();
}
}
@@ -141,36 +141,36 @@ public void setNextEventQueue() {
this.nextEventQueue = nextQueue;
this.nextQueueEventTime = earliest;
}
-
- /**
- * Update (move, connect, disconnect etc.) all hosts in the world.
+
+ /**
+ * Update (move, connect, disconnect etc.) all hosts in the world.
* Runs all external events that are due between the time when
- * this method is called and after one update interval.
- */
- public void update () {
- double runUntil = SimClock.getTime() + this.updateInterval;
+ * this method is called and after one update interval.
+ */
+ public void update () {
+ double runUntil = SimClock.getTime() + this.updateInterval;
setNextEventQueue();
-
+
/* process all events that are due until next interval update */
while (this.nextQueueEventTime <= runUntil) {
simClock.setTime(this.nextQueueEventTime);
- ExternalEvent ee = this.nextEventQueue.nextEvent();
+ ExternalEvent ee = this.nextEventQueue.nextEvent();
ee.processEvent(this);
updateHosts(); // update all hosts after every event
- setNextEventQueue();
- }
+ setNextEventQueue();
+ }
- moveHosts(this.updateInterval);
+ moveHosts(this.updateInterval);
simClock.setTime(runUntil);
updateHosts();
-
- /* inform all update listeners */
- for (UpdateListener ul : this.updateListeners) {
- ul.updated(this.hosts);
- }
- }
+
+ /* inform all update listeners */
+ for (UpdateListener ul : this.updateListeners) {
+ ul.updated(this.hosts);
+ }
+ }
/**
* Updates all hosts (calls update for every one of them). If update
@@ -187,89 +187,89 @@ private void updateHosts() {
}
}
else { // update order randomizing is on
- assert this.updateOrder.size() == this.hosts.size() :
+ assert this.updateOrder.size() == this.hosts.size() :
"Nrof hosts has changed unexpectedly";
Random rng = new Random(SimClock.getIntTime());
- Collections.shuffle(this.updateOrder, rng);
+ Collections.shuffle(this.updateOrder, rng);
for (int i=0, n = hosts.size();i < n; i++) {
if (this.isCancelled) {
break;
}
this.updateOrder.get(i).update(simulateConnections);
- }
+ }
}
-
+
if (simulateConOnce && simulateConnections) {
simulateConnections = false;
}
}
-
- /**
- * Moves all hosts in the world for a given amount of time
- * @param timeIncrement The time how long all nodes should move
- */
- private void moveHosts(double timeIncrement) {
- for (int i=0,n = hosts.size(); i- * Handler for managing event queues. Supports two different type of event + * Handler for managing event queues. Supports two different type of event * queues: external event queues and event generator classes. * For external event queues, the events are defined in external data * file(s) (see e.g. input.StandarEventsReader). Event generator classes * define events dynamically. Both type of event queues must implement * the input.EventQueue interface. *
- * The total number of event queues to load is defined with variable
+ * The total number of event queues to load is defined with variable
* NROF_SETTING, e.g.
* Events.nrof = 3
- * Separate event queues are configured with syntax
+ * Separate event queues are configured with syntax
* EventsN.variable = value e.g.:
* Events1.filePath = ee/messages.txt
* or
* Events2.class = RandomMessageGenerator
*
* External event files are used when the variable
- * First line of the file should be the offset header. Syntax of the header
- * should be:
- * Following lines' syntax should be:
- * All lines must be sorted by time. Sampling interval (time difference between
- * two time instances) must be same for the whole file.
- *
+ * First line of the file should be the offset header. Syntax of the header
+ * should be:
+ * Following lines' syntax should be:
+ * All lines must be sorted by time. Sampling interval (time difference between
+ * two time instances) must be same for the whole file.
+ * External movement reader for traces that are in path format. Uses two
* trace files, one for the paths and one for specifying activity times.
* Nodes will follow the paths in the trace file, and pause between paths.
* Activity times refer to the periods of time when there is valid trace data
* about the node. Reads external traces that are of the form: The first line should be:
* Activity trace file format is:
* The ID in the trace files must match IDs of nodes in the simulation, the
* coordinates must match the ONE coordinate system (units in meters) and the
* times must match the ONE simulation time.
* Trace and activity files ending in .zip are assumed to be
* compressed and will be automatically uncompressed during reading. The whole
* trace is loaded into memory at once.PATH_SETTING
- * is used to define the path to the event file and event generator class
- * is loaded when the name of the class is defined with
- * CLASS_SETTING.
- */
-public class EventQueueHandler {
- /** Event queue settings main namespace ({@value})*/
- public static final String SETTINGS_NAMESPACE = "Events";
+ * is used to define the path to the event file and event generator class
+ * is loaded when the name of the class is defined with
+ * CLASS_SETTING.
+ */
+public class EventQueueHandler {
+ /** Event queue settings main namespace ({@value})*/
+ public static final String SETTINGS_NAMESPACE = "Events";
/** number of event queues -setting id ({@value})*/
public static final String NROF_SETTING = "nrof";
@@ -43,22 +43,22 @@ public class EventQueueHandler {
public static final String CLASS_SETTING = "class";
/** name of the package where event generator classes are looked from */
public static final String CLASS_PACKAGE = "input";
-
- /** number of events to preload from file -setting id ({@value})*/
- public static final String PRELOAD_SETTING = "nrofPreload";
- /** path of external events file -setting id ({@value})*/
- public static final String PATH_SETTING = "filePath";
-
- private List
- * minTime maxTime minX maxX minY maxY minZ maxZ
- *
- * Last two values (Z-axis) are ignored at the moment but can be present
- * in the file.
- *
- * time id xPos yPos
- * where time is the time when a node with id should
- * be at location (xPos, yPos).
- *
+ * minTime maxTime minX maxX minY maxY minZ maxZ
+ *
+ * Last two values (Z-axis) are ignored at the moment but can be present
+ * in the file.
+ *
+ * time id xPos yPos
+ * where time is the time when a node with id should
+ * be at location (xPos, yPos).
+ * id time_1,x_1,y_1 time_2,x_2,y_2 ... \n
- *
+ *
* maxID minTime maxTime minX maxX minY maxY
- *
+ *
* id activeStart activeEnd\n
- *
+ *
*