Fixed logic where numLayers=0 did not send any more segments; moved r…

…eporting to messages after warmup of 1 day; replaced 60 hour runs by 6 hours trends are similar after 36 hours

data/reports.txt

@@ -3,7 +3,7 @@ Scenario.name = %%Scenario.subname%%_N%%Scenario.nodeNotes%%_R%%Scenario.flow%%_
 
 Report.nrofReports = 2
 # length of the warm up period (simulated seconds)
-Report.warmup = 0
+Report.warmup = 86400
 # default directory of reports (can be overridden per Report with output setting)
 Report.reportDir = reports/
 # Report classes to load

data/ttl/60hrs.txt → data/ttl/06hrs.txt

@@ -2,4 +2,4 @@
 # 172800
 #  43200
 # 216000
-Group.msgTtl = 3600
+Group.msgTtl = 360

one_list.sh

@@ -1,20 +1,20 @@
 #~/bin/bash
-bStr=" -b 1"
+bStr=" -b 5"
 bCmd="java -Xmx512M -cp target:lib/ECLA.jar:lib/DTNConsoleConnection.jar core.DTNSim ${bStr} data/def.txt data/vct.txt "
 eCmd="data/reports.txt"
 
 nonLinear="data/flow/nonLinear.txt"
 prefCC="data/prefCC.txt"
 fullAdapt="data/fullAdapt.txt"
-ttlList="12 24 36 48 60"
+ttlList="24 36 48 12"
 
 for  ttl in ${ttlList} ; do
-      # five runs for Full Adapt, prefCC, nonLinear, Linear, nonSVC
+      # five runs for Full Adapt, prefCC, nonLinear, Linear, nonSVC - only Full Adapt and nonSVC for now
       echo "${bCmd} ${nonLinear} ${fullAdapt} data/ttl/${ttl}hrs.txt ${eCmd}"
-      echo "${bCmd} ${nonLinear} ${prefCC}    data/ttl/${ttl}hrs.txt ${eCmd}"
-      echo "${bCmd} ${nonLinear} data/ttl/${ttl}hrs.txt ${eCmd}"
+      # echo "${bCmd} ${nonLinear} ${prefCC}    data/ttl/${ttl}hrs.txt ${eCmd}"
+      # echo "${bCmd} ${nonLinear} data/ttl/${ttl}hrs.txt ${eCmd}"
 
-      echo "${bCmd} data/ttl/${ttl}hrs.txt ${eCmd}"
+      # echo "${bCmd} data/ttl/${ttl}hrs.txt ${eCmd}"
 
       echo "${bCmd} data/flow/nonSVC.txt data/ttl/${ttl}hrs.txt ${eCmd}"
 

report.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ttlList="720 1440 2160 2880 3600"
+ttlList="720 1440 2160 2880"
 flowList="low medium high"
 contorlList="nonSVC sAdptAndCC"
 nodeList="base drop1 drop2 drop4"

src/routing/SNWAdaptiveRouter.java

@@ -329,7 +329,7 @@ protected void sendBurst() {
 			layerLast = numLayers;
 		}
 		if(0 != (adaptMode & SRC_ADAPT)) {
-			if(burstId * burstGap> 24 * 3600) 
+			if(burstId * burstGap> 6 * 3600) 
 				adaptLayerLast();
 
 		}
@@ -350,6 +350,7 @@ protected void sendBurst() {
 		burstId++;
 	}
 
+	int ack0=0, ack1=0, ack2=0, ack3=0;
 	// adapt based on acks - presently same logic as scripts
 	void adaptLayerLast() {
 		int ackCount=0;
@@ -361,22 +362,28 @@ void adaptLayerLast() {
 		msgId = "B" + String.format("%04d", burstId - 4 * sixHrBurstCount) + "_L0";
 		if(srcAckList.contains(msgId)) ackCount++;
 		if(ackCount ==0) {
+			ack0++;
 			if(layerLast > 0.15 * numLayers)
 				layerLast = 0.98 * layerLast;
 		} else if(ackCount ==1){
+			ack1++;
 			if(layerLast > 0.33 * numLayers)
 				layerLast = 0.99 * layerLast;
 			else
 				layerLast = 0.002 +  layerLast;
 		} else if(ackCount ==2){
+			ack2++;
 			if(layerLast > 0.66 * numLayers)
 				layerLast = 0.995 * layerLast;
 			else
 				layerLast = 0.005 +  layerLast;
 		} else { // ackCount ==3
+			ack3++;
 			if(layerLast < numLayers)
 				layerLast = 0.01 +  layerLast;
 		}
+		if(layerLast < 1.1) layerLast = 1.1;
+		if(layerLast > numLayers) layerLast = numLayers;
 	}
 
 	List<String> ackList = new ArrayList<String>();
@@ -430,7 +437,8 @@ void 	printSummary() {
 		SNWAdaptiveRouter destRtr = ((SNWAdaptiveRouter)dstHost.getRouter());
 		System.out.println("At time " + SimClock.getIntTime() / 3600 + " hours Sent=" + sentCount + 
 				" BL-rcvd=" + destRtr.baseLayerCount + " delivered=" + destRtr.destRcvdCount + 
-				" layerLast " + layerLast);
+				" layerLast " + layerLast + " ackCounts " + ack0 + ", "+ ack1 + ", "+ 
+				ack2 + ", "+ ack3);
 	}
 
 	@SuppressWarnings(value = { "unchecked", "rawtypes" }) /* ugly way to make this generic */