diff --git a/cooja/simulation-prng.csc b/cooja/simulation-prng.csc
index 113dfff..bad4eb8 100644
--- a/cooja/simulation-prng.csc
+++ b/cooja/simulation-prng.csc
@@ -8,7 +8,7 @@
[APPS_DIR]/powertracker
My simulation
- 1
+ 0
1000000
org.contikios.cooja.radiomediums.UDGM
@@ -64,8 +64,8 @@
org.contikios.cooja.interfaces.Position
- 53.09193301249495
- 51.73556976035091
+ 0.0
+ 0.0
0.0
@@ -82,8 +82,8 @@
org.contikios.cooja.interfaces.Position
- 96.42054585477612
- 68.51308818534717
+ -22.650869432834668
+ 74.38762721115089
0.0
@@ -100,8 +100,8 @@
org.contikios.cooja.interfaces.Position
- 28.288717658759253
- 95.5885768074478
+ -74.59065291431997
+ -56.633623496140295
0.0
@@ -118,8 +118,8 @@
org.contikios.cooja.interfaces.Position
- 15.766261883357657
- 13.205730860350783
+ 16.839128846913724
+ 26.67970606491143
0.0
@@ -136,8 +136,8 @@
org.contikios.cooja.interfaces.Position
- 4.055322650147753
- 54.05225656749616
+ 79.34196205380218
+ 51.695822999081884
0.0
@@ -154,8 +154,8 @@
org.contikios.cooja.interfaces.Position
- 83.36080874126749
- 69.14227824411343
+ -36.57820740149755
+ 42.91416489845773
0.0
@@ -172,8 +172,8 @@
org.contikios.cooja.interfaces.Position
- 58.64938567406202
- 46.2605492265615
+ -25.890844807548092
+ 85.19469346045699
0.0
@@ -190,8 +190,8 @@
org.contikios.cooja.interfaces.Position
- 56.08488999102958
- 97.76384479739446
+ -46.395798691168096
+ 0.7325486751576591
0.0
@@ -208,8 +208,8 @@
org.contikios.cooja.interfaces.Position
- 91.38979502566124
- 94.37928793173187
+ 33.82980480818543
+ -5.070680754378927
0.0
@@ -226,8 +226,8 @@
org.contikios.cooja.interfaces.Position
- 35.91383296948861
- 97.2673119821112
+ -47.77051667497214
+ -48.06155067296643
0.0
@@ -244,8 +244,8 @@
org.contikios.cooja.interfaces.Position
- 47.71068988720166
- 75.47050686208277
+ -1.8548436477461507
+ 21.173372187985677
0.0
@@ -262,8 +262,8 @@
org.contikios.cooja.interfaces.Position
- 33.85553508722398
- 8.403791290765138
+ -59.12873887147616
+ 83.72833184473811
0.0
@@ -280,8 +280,8 @@
org.contikios.cooja.interfaces.Position
- 86.96724082337165
- 45.98633029738626
+ 46.84886211683643
+ 50.0352328070811
0.0
@@ -298,8 +298,8 @@
org.contikios.cooja.interfaces.Position
- 73.25623743646457
- 69.86147834292208
+ -82.21934443138721
+ -12.303236226578633
0.0
@@ -316,8 +316,8 @@
org.contikios.cooja.interfaces.Position
- 14.843186661781315
- 89.25573884325185
+ 2.4491129800465785
+ 96.27870125033354
0.0
@@ -334,8 +334,8 @@
org.contikios.cooja.interfaces.Position
- 65.90943273925322
- 78.36297705481104
+ -70.55392611960434
+ -14.67953127565589
0.0
@@ -352,8 +352,8 @@
org.contikios.cooja.interfaces.Position
- 87.2796217860686
- 76.56736092588233
+ -86.02521421597429
+ -13.092028432619983
0.0
@@ -370,8 +370,8 @@
org.contikios.cooja.interfaces.Position
- 25.7634401883041
- 83.65941722120878
+ -87.38098188799927
+ 65.63791942656712
0.0
@@ -388,8 +388,8 @@
org.contikios.cooja.interfaces.Position
- 39.72918340338105
- 79.74184053826752
+ 45.34048487163702
+ -1.063557643380662
0.0
@@ -406,8 +406,8 @@
org.contikios.cooja.interfaces.Position
- 91.98777279279888
- 8.977031794409719
+ -64.86038416979342
+ 38.62597412082762
0.0
@@ -424,8 +424,8 @@
org.contikios.cooja.interfaces.Position
- 0.6944796346997073
- 10.630459611640386
+ -29.047358595108562
+ 80.10204720117719
0.0
@@ -442,8 +442,8 @@
org.contikios.cooja.interfaces.Position
- 19.73092440955816
- 3.576331661536858
+ -12.192922284824931
+ -68.69856410016904
0.0
@@ -473,10 +473,10 @@
org.contikios.cooja.plugins.skins.GridVisualizerSkin
org.contikios.cooja.plugins.skins.TrafficVisualizerSkin
org.contikios.cooja.plugins.skins.UDGMVisualizerSkin
- 5.160859370773246 0.0 0.0 5.160859370773246 81.19356119515358 24.72727272727279
+ 2.5485605217256353 0.0 0.0 2.5485605217256353 373.3797444895934 225.85517563765612
672
- 1
+ 0
609
1
1
@@ -573,10 +573,10 @@ log.testOK();
false
362
- 0
+ 1
116
- 276
- 639
+ 288
+ 649
diff --git a/oracle/project-conf.h b/oracle/project-conf.h
index fd81684..025d4af 100644
--- a/oracle/project-conf.h
+++ b/oracle/project-conf.h
@@ -22,13 +22,13 @@
/* RPL specific tuning parameters */
#undef RPL_CONF_DIO_REDUNDANCY
-#define RPL_CONF_DIO_REDUNDANCY 10
+#define RPL_CONF_DIO_REDUNDANCY 1
#undef RPL_CONF_INTERVAL_MIN
-#define RPL_CONF_INTERVAL_MIN 3
+#define RPL_CONF_INTERVAL_MIN 11
#undef RPL_CONF_DIO_INTERVAL_DOUBLINGS
-#define RPL_CONF_DIO_INTERVAL_DOUBLINGS 8
+#define RPL_CONF_DIO_INTERVAL_DOUBLINGS 4
#endif
diff --git a/simulation/main.sh b/simulation/main.sh
index d8881bc..529895b 100755
--- a/simulation/main.sh
+++ b/simulation/main.sh
@@ -4,25 +4,34 @@ REPOSITORY=$(pwd)
CONTIKI=/home/giomba/workspace/uni/contiki/
SIMULATION=/home/giomba/workspace/uni/anaws-proj/cooja/simulation-prng.csc
REPEAT=30
+INIT=0
# Setup environment
mkdir -p "$REPOSITORY/simulation/results"
# Setup simulation parameters
-for KAPPA in 1 2 3 4 5; do
- for I_MIN in 20 18 16; do
- I_MAX=$((22 - I_MIN)) # 22 =~ 70 minutes
+for KAPPA in 1; do
+ for I_MIN in 11; do
+ I_MAX=4
+ # set trickle parameters in project-conf.h
for PROJECTCONF in "$REPOSITORY/oracle/project-conf.h" "$CONTIKI/examples/ipv6/rpl-border-router/project-conf.h"; do
sed -i "s/^\#define RPL_CONF_DIO_REDUNDANCY *[0-9]*$/\#define RPL_CONF_DIO_REDUNDANCY $KAPPA/g" "$PROJECTCONF"
sed -i "s/^\#define RPL_CONF_INTERVAL_MIN *[0-9]*$/\#define RPL_CONF_INTERVAL_MIN $I_MIN/g" "$PROJECTCONF"
sed -i "s/^\#define RPL_CONF_DIO_INTERVAL_DOUBLINGS *[0-9]*$/\#define RPL_CONF_DIO_INTERVAL_DOUBLINGS $I_MAX/g" "$PROJECTCONF"
done
+ # compile firmware using all available cores
+ cd "$REPOSITORY/oracle"
+ make -j$(nproc) TARGET=z1
+
+ cd "$CONTIKI/examples/ipv6/rpl-border-router"
+ make -j$(nproc) TARGET=z1
+
# Run simulation
- for (( i = 0; i<=$REPEAT; i++ )); do
+ for (( i=$INIT; i<$INIT+$REPEAT; i++ )); do
cd "$REPOSITORY/cooja"
- sed -i "s_.*<\\/randomseed>_$i<\\/randomseed>_g" simulation-prng.csc
+ sed -i "s_.*<\\/randomseed>_$i<\\/randomseed>_g" "$SIMULATION"
cd "$CONTIKI/tools/cooja"
ant run_nogui -Dargs="$SIMULATION" &