jDEECoAgent update

d3scomp · Jun 16, 2014 · 04326f3 · 04326f3
1 parent b3e17c1
commit 04326f3
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
@@ -43,6 +43,15 @@ public JDEECoAgent(Id id, Id currentLinkId, MATSimInput input) {
 		 */
 		updateNextLink();
 	}
+
+	public JDEECoAgent(Id id, Id currentLinkId) {
+		this.id = id;
+		this.currentLinkId = currentLinkId;
+		/**
+		 * Initialize next link id
+		 */
+		updateNextLink();
+	}
 
 	public void setSimulation(Netsim simulation) {
 		this.simulation = simulation;
@@ -53,7 +62,7 @@ public void abort(double now) {
 	}
 
 	public void endActivityAndComputeNextState(double now) {
-		if (now == input.activityEndTime) {
+		if (input != null && now == input.activityEndTime) {
 			this.simulation.getEventsManager().processEvent(
 					this.simulation
 							.getEventsManager()
@@ -108,6 +117,7 @@ public Id getCurrentLinkId() {
 
 	public Id getDestinationLinkId() {
 		// Log.i(id.toString() + " getDestination " + input.destination);
+		//We assume here input not being null.
 		return input.destination;
 	}