Changeset 407

Timestamp:

07/30/09 22:26:07 (15 years ago)

Author:

trnewman

Message:

Adding command line options for sensing threshold.

Files:

• vtcross/trunk/src/cognitive_engines/DSA_CE/examples/gnuradio-examples/benchmark_dsa.py (modified) (3 diffs)

vtcross/trunk/src/cognitive_engines/DSA_CE/examples/gnuradio-examples/benchmark_dsa.py

@@ -180 +180 @@
         parser_tx = OptionParser(option_class=eng_option, conflict_handler="resolve")
         
-        parser_tx.add_option("-c", "--cross", action="store_true", default=False,
-                                help="Use the CROSS engine for DSA decisions: default is random.")
-  
         parser_tx.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
                         default='gmsk',
-                        help="Select modulation from: %s [default=%%default]"
-                                % (', '.join(mods.keys()),))
-
+                        help="Select modulation from: %s [default=%%default]"
+                                % (', '.join(mods.keys()),))
         parser_tx.add_option("-s", "--size", type="eng_float", default=1500,
                         help="set packet size [default=%default]")
@@ -198 +194 @@
  
         expert_grp_tx = parser_tx.add_option_group("Expert_tx")
+        dsa_grp = parser_tx.add_option_group("DSA Options")
+        dsa_grp.add_option("-c", "--cross", action="store_true", default=False,
+                                help="Use the CROSS CBR Cognitive Engine for DSA channel decisions [default=off (random selection)].")
+        
+        dsa_grp.add_option("-T", "--threshold", type="eng_float", default=1.5e8,
+                        help="set primary user sensing energy threshold [default=%default]")
+  
 
         transmit_path.add_options(parser_tx, expert_grp_tx)
+        parser_tx.remove_option('-f');
+        parser_tx.remove_option('--tx-freq');
 
         for mod in mods.values():
@@ -228 +233 @@
         expert_grp_rx = parser_rx.add_option_group("Expert_rx")
         receive_path.add_options(parser_rx, expert_grp_rx)
+        
+        parser_rx.remove_option('-f');
+        
         parser_rx.add_option("-c", "--cross", action="store_true", default=False,
                                 help="Use the CROSS engine for DSA decisions: default is random.")
+        parser_rx.add_option("-T", "--threshold", type="eng_float", default=1.5e8,
+                        help="set primary user sensing energy threshold [default=%default]")
+
+
 
         (options_rx, args_rx) = parser_rx.parse_args ()