From c05497dc1965d00c670930364dc54e8ad6b59ef3 Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <bloessl@ccs-labs.org>
Date: Tue, 31 May 2016 15:40:43 +0200
Subject: [PATCH] move awg simulations to root

---
 simulations/awgn/.gitignore                   |   2 +
 .../simulations => simulations}/awgn/Makefile |   2 +
 .../simulations => simulations}/awgn/parse.sh |   0
 .../simulations => simulations}/awgn/pdr.pdf  | Bin 13240 -> 13501 bytes
 .../simulations => simulations}/awgn/plot.py  |   0
 .../simulations => simulations}/awgn/sim.grc  | 345 ++++++++----------
 6 files changed, 156 insertions(+), 193 deletions(-)
 create mode 100644 simulations/awgn/.gitignore
 rename {utils/simulations => simulations}/awgn/Makefile (82%)
 rename {utils/simulations => simulations}/awgn/parse.sh (100%)
 rename {utils/simulations => simulations}/awgn/pdr.pdf (76%)
 rename {utils/simulations => simulations}/awgn/plot.py (100%)
 rename {utils/simulations => simulations}/awgn/sim.grc (86%)

diff --git a/simulations/awgn/.gitignore b/simulations/awgn/.gitignore
new file mode 100644
index 0000000..e343d66
--- /dev/null
+++ b/simulations/awgn/.gitignore
@@ -0,0 +1,2 @@
+results/
+sim.py
diff --git a/utils/simulations/awgn/Makefile b/simulations/awgn/Makefile
similarity index 82%
rename from utils/simulations/awgn/Makefile
rename to simulations/awgn/Makefile
index e58f3c6..b189403 100644
--- a/utils/simulations/awgn/Makefile
+++ b/simulations/awgn/Makefile
@@ -18,6 +18,7 @@ results/all.csv: $(PCAPFILES)
 %.pcap: sim.py
 	@echo $@
 	mkdir -p results
+	export GR_CONF_DEFAULT_MAX_MESSAGES=123
 	$(eval REPETITION=$(shell python -c "print \"$@\".split(\"_\")[1]"))
 	$(eval ENCODING=$(shell python -c "print \"$@\".split(\"_\")[2]"))
 	$(eval SNR=$(shell python -c "print \"$@\".split(\"_\")[3]"))
@@ -25,4 +26,5 @@ results/all.csv: $(PCAPFILES)
 	@echo ENCODING=$(ENCODING)
 	@echo SNR=$(SNR)
 	./sim.py --messages=$(MESSAGES) --encoding=$(ENCODING) --snr=$(SNR) --repetition=$(REPETITION)
+#gdb -ex run -ex quit --args python ./sim.py --messages=$(MESSAGES) --encoding=$(ENCODING) --snr=$(SNR) --repetition=$(REPETITION)
 
diff --git a/utils/simulations/awgn/parse.sh b/simulations/awgn/parse.sh
similarity index 100%
rename from utils/simulations/awgn/parse.sh
rename to simulations/awgn/parse.sh
diff --git a/utils/simulations/awgn/pdr.pdf b/simulations/awgn/pdr.pdf
similarity index 76%
rename from utils/simulations/awgn/pdr.pdf
rename to simulations/awgn/pdr.pdf
index 08277917d68161a0c258fa3bd05d06a5409bd5f8..ce9004505880c7d24121bffee7e4f065617cbdd7 100644
GIT binary patch
delta 3232
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

delta 2904
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

diff --git a/utils/simulations/awgn/plot.py b/simulations/awgn/plot.py
similarity index 100%
rename from utils/simulations/awgn/plot.py
rename to simulations/awgn/plot.py
diff --git a/utils/simulations/awgn/sim.grc b/simulations/awgn/sim.grc
similarity index 86%
rename from utils/simulations/awgn/sim.grc
rename to simulations/awgn/sim.grc
index c1be222..f25a90d 100644
--- a/utils/simulations/awgn/sim.grc
+++ b/simulations/awgn/sim.grc
@@ -108,6 +108,112 @@
       <value>96000</value>
     </param>
   </block>
+  <block>
+    <key>analog_noise_source_x</key>
+    <param>
+      <key>amp</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(916, 616)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>90</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>analog_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>repetition</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_add_xx</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(904, 496)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>90</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_add_xx_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
   <block>
     <key>blocks_file_sink</key>
     <param>
@@ -136,7 +242,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(40, 365)</value>
+      <value>(256, 388)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -152,7 +258,7 @@
     </param>
     <param>
       <key>unbuffered</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>vlen</key>
@@ -183,7 +289,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(520, 568)</value>
+      <value>(688, 588)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -210,116 +316,6 @@
       <value>1</value>
     </param>
   </block>
-  <block>
-    <key>blocks_null_sink</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bus_conns</key>
-      <value>[[0,],]</value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(408, 424)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_null_sink_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
-  <block>
-    <key>channels_channel_model</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>block_tags</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>epsilon</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>freq_offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(704, 543)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>channels_channel_model_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>noise_voltage</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>repetition</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>1.0</value>
-    </param>
-  </block>
   <block>
     <key>parameter</key>
     <param>
@@ -337,7 +333,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1016, 14)</value>
+      <value>(792, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -396,7 +392,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(368, 543)</value>
+      <value>(512, 560)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -424,7 +420,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
   </block>
   <block>
-    <key>foo_periodic_msg_source</key>
+    <key>foo_random_periodic_msg_source</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -447,7 +443,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(288, 181)</value>
+      <value>(392, 200)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -455,15 +451,15 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>id</key>
-      <value>foo_periodic_msg_source_0</value>
+      <value>foo_random_periodic_msg_source_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>msg</key>
-      <value>pmt.intern("".join([chr(random.randint(0,255)) for x in (lambda: (random.seed(repetition) == None) and range(pdu_len-24))()]))</value>
+      <key>msg_len</key>
+      <value>pdu_len - 24</value>
     </param>
     <param>
       <key>minoutbuf</key>
@@ -475,12 +471,16 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>interval</key>
-      <value>interval</value>
+      <value>5</value>
     </param>
     <param>
       <key>quit</key>
       <value>True</value>
     </param>
+    <param>
+      <key>seed</key>
+      <value>repetition</value>
+    </param>
   </block>
   <block>
     <key>foo_wireshark_connector</key>
@@ -506,7 +506,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(248, 373)</value>
+      <value>(464, 396)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -530,7 +530,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mac</key>
+    <key>ieee802_11_mac</key>
     <param>
       <key>bss_mac</key>
       <value>[0xff, 0xff, 0xff, 0xff, 0xff, 0xff]</value>
@@ -557,7 +557,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(552, 216)</value>
+      <value>(720, 236)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -565,7 +565,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mac_0</value>
+      <value>ieee802_11_mac_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -642,49 +642,6 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
       <value>import random</value>
     </param>
   </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value>message generation interval (in ms)</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(792, 21)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>interval</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>short_id</key>
-      <value></value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>intx</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>200</value>
-    </param>
-  </block>
   <block>
     <key>parameter</key>
     <param>
@@ -744,7 +701,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1032, 173)</value>
+      <value>(1048, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -760,7 +717,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>short_id</key>
-      <value></value>
+      <value>l</value>
     </param>
     <param>
       <key>type</key>
@@ -787,7 +744,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(216, 13)</value>
+      <value>(208, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -803,7 +760,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>short_id</key>
-      <value></value>
+      <value>r</value>
     </param>
     <param>
       <key>type</key>
@@ -877,7 +834,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(568, 376)</value>
+      <value>(720, 408)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -895,28 +852,42 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>bandwidth</key>
+      <value>10e6</value>
+    </param>
     <param>
       <key>chan_est</key>
-      <value>0</value>
+      <value>ieee802_11.LS</value>
     </param>
     <param>
       <key>encoding</key>
       <value>encoding</value>
     </param>
+    <param>
+      <key>frequency</key>
+      <value>5.89e9</value>
+    </param>
     <param>
       <key>sensitivity</key>
       <value>0.56</value>
     </param>
   </block>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>channels_channel_model_0</sink_block_id>
+    <source_block_id>analog_noise_source_x_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>blocks_add_xx_0</source_block_id>
+    <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>channels_channel_model_0</source_block_id>
-    <sink_block_id>wifi_phy_hier_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -927,14 +898,8 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>foo_periodic_msg_source_0</source_block_id>
-    <sink_block_id>foo_wireshark_connector_0</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>in</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>foo_periodic_msg_source_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <source_block_id>foo_random_periodic_msg_source_0</source_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>app in</sink_key>
   </connection>
@@ -945,17 +910,11 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
+    <source_block_id>ieee802_11_mac_0</source_block_id>
     <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
   </connection>
-  <connection>
-    <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>blocks_null_sink_0</sink_block_id>
-    <source_key>1</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
     <sink_block_id>foo_wireshark_connector_0</sink_block_id>