Displaying differences for changeset
 
display as  

src/main/java/ficus_transims/TransportationNetworkPrep.java

@@ -49,6 +49,9 @@ public class TransportationNetworkPrep {
     
     @OutNode
     public RoadNetwork N;
+
+    @In
+    public boolean disrupted_network = false;
     
     @Execute
     public void exec() throws Exception {
@@ -59,17 +62,22 @@ public class TransportationNetworkPrep {
             N.buildNodeLink(loc);
             N.WriteNode(loc);
             N.WriteLink(loc);
-            File tempFile = new File(road_disrupted);
-            if (tempFile.exists()) {
-                N.readinDisruption(road_disrupted);
-                System.out.println("Network disruption finished");
+            if (disrupted_network){
+                File tempFile = new File(road_disrupted);
+                if (tempFile.exists()) {
+                    N.readinDisruption(road_disrupted);
+                    System.out.println("Network disruption finished");
+                }
             }
             N.WriteDisruptedLink(loc);
         }else{
             N = new RoadNetwork(new_node, new_link, network_file);
-            File tempFile = new File(road_disrupted);
-            if (tempFile.exists()){
-                N.readinDisruption(road_disrupted);
+            if (disrupted_network){
+                File tempFile = new File(road_disrupted);
+                if (tempFile.exists()) {
+                    N.readinDisruption(road_disrupted);
+                    System.out.println("Network disruption finished");
+                }
             }
             N.WriteNode(loc);
             N.WriteDisruptedLink(loc);

src/main/java/ficus_transims/UrbanSysInit.java

@@ -93,9 +93,11 @@ public class UrbanSysInit {
     public Integer loopIndex;
 
     @InNode
+    @Out
     public String startDate;
 
     @InNode
+    @Out
     public String endDate;