Changeset 406

Timestamp:

07/30/09 21:36:45 (15 years ago)

Author:

trnewman

Message:

Adding command line argument for using cross or random.

Files:

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

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

@@ -77 +77 @@
                 return average_time
 
-        def get_freq(hop_freq,probe_level,absent_time):
+        def get_freq(hop_freq,probe_level,absent_time,cross):
 
                 # Convert hop_freq to our unique channel list
 
-                if hop_freq == 462562500:
-                        channel = 1
-                if hop_freq == 462712500:
-                        channel = 2
-                if hop_freq == 467562500:
-                        channel = 3
-                if hop_freq == 467712500:
-                        channel = 4
-
-                currentParameters = Parameter(1)
-                currentParameters[0].name = "channel"
-                currentParameters[0].value = channel
-
-                o = Observable(2)
-                o[0].value = probe_level
-                o[0].name = "energy"
-        
-                o[1].value = absent_time 
-                o[1].name = "communication_time"
-                
-                # If time == 0 then we are scanning and we dont want to 
-                #  use this time in the averaging process.
-
-                if absent_time != 0:
-                    UpdateParameterPerformance(currentParameters,1,o,1)
-
+                if cross == True:
+ 
+                        if hop_freq == 462562500:
+                                channel = 1
+                        if hop_freq == 462712500:
+                                channel = 2
+                        if hop_freq == 467562500:
+                                channel = 3
+                        if hop_freq == 467712500:
+                                channel = 4
+
+                        currentParameters = Parameter(1)
+                        currentParameters[0].name = "channel"
+                        currentParameters[0].value = channel
+
+                        o = Observable(2)
+                        o[0].value = probe_level
+                        o[0].name = "energy"
+        
+                        o[1].value = absent_time 
+                        o[1].name = "communication_time"
+                
+                        # If time == 0 then we are scanning and we dont want to 
+                        #  use this time in the averaging process.
+
+                        if absent_time != 0:
+                                UpdateParameterPerformance(currentParameters,1,o,1)
+
+                        else:
+                                # Get the average communication time
+                                average_time = get_average_time(channel, absent_time)
+                                o[1].value = average_time 
+                                o[1].name = "communication_time"
+                                UpdateParameterPerformance(currentParameters,1,o,2)
+
+                        p = Parameter(1)
+                        p = GetOptimalParameters(o,2,currentParameters,1);
+                
+                        channel = get_real_channel(int(p[0].value))
                 else:
-                    # Get the average communication time
-                    average_time = get_average_time(channel, absent_time)
-                    o[1].value = average_time 
-                    o[1].name = "communication_time"
-                    UpdateParameterPerformance(currentParameters,1,o,2)
-
-                p = Parameter(1)
-                p = GetOptimalParameters(o,2,currentParameters,1);
-                
-                channel = get_real_channel(int(p[0].value))
-
-                if channel < 8:
+                        channel = int(random.choice([1,7,8,14]))
+        
+
+                if channel < 8:
                         hop_freq = float(1e6 * (462.5625+(channel-1)*0.025))#setting the centre freq frequency for sending packets
-                else:
+                else:
                         hop_freq = float(1e6 * (467.5625+(channel-8)*0.025))#setting the centre freq frequency for sending packets      
-
-                stats_array[int(p[0].value)] = stats_array[int(p[0].value)] + 1
+                
                 return channel,hop_freq #returning the channel number and hop frequency
         
@@ -175 +179 @@
 
         parser_tx = OptionParser(option_class=eng_option, conflict_handler="resolve")
-        parser_tx.add_option("", "--vtcross", action="store_true", default=False,
+        
+        parser_tx.add_option("-c", "--cross", action="store_true", default=False,
                                 help="Use the CROSS engine for DSA decisions: default is random.")
   
@@ -223 +228 @@
         expert_grp_rx = parser_rx.add_option_group("Expert_rx")
         receive_path.add_options(parser_rx, expert_grp_rx)
+        parser_rx.add_option("-c", "--cross", action="store_true", default=False,
+                                help="Use the CROSS engine for DSA decisions: default is random.")
 
         (options_rx, args_rx) = parser_rx.parse_args ()
@@ -235 +242 @@
         #############
 
+
+
+        if options_rx.cross == True:
+                print "[[ Using the CROSS DSA Cognitive Engine ]]\n"
+        else:
+                print "[[ Using the RANDOM channel selection algorithm ]]\n"
+                
         # build the graph
 
@@ -264 +278 @@
                                 
                                 if return_flag == 0:
-                                        ch,hop_freq = get_freq(hop_freq,ch_energy,0)
+                                        ch,hop_freq = get_freq(hop_freq,ch_energy,0,options_rx.cross)
                                 else:
-                                        ch,hop_freq = get_freq(hop_freq,ch_energy,elapsed_time)
+                                        ch,hop_freq = get_freq(hop_freq,ch_energy,elapsed_time,options_rx.cross)
                                         return_flag = 0