REM examples: allow setting resolution via cmd line
authorNicola Baldo <nbaldo@cttc.es>
Tue, 31 Jan 2012 11:51:51 +0100
changeset 8605 55a01da4a323
parent 8604 65ae4fb796af
child 8606 7542c79c9d19
REM examples: allow setting resolution via cmd line
src/lte/examples/lena-rem-sector-antenna.cc
src/lte/examples/lena-rem.cc
--- a/src/lte/examples/lena-rem-sector-antenna.cc	Mon Jan 30 14:09:38 2012 +0100
+++ b/src/lte/examples/lena-rem-sector-antenna.cc	Tue Jan 31 11:51:51 2012 +0100
@@ -37,8 +37,6 @@
 int
 main (int argc, char *argv[])
 {
-  double simTime = 0.03;
-
   CommandLine cmd;
   cmd.Parse (argc, argv);
 
@@ -214,27 +212,28 @@
       lteHelper->ActivateEpsBearer (ueDev, bearer, EpcTft::Default ());
     }
 
-  Simulator::Stop (Seconds (simTime));
-  lteHelper->EnableTraces ();
+  // by default, simulation will anyway stop right after the REM has been generated
+  Simulator::Stop (Seconds (0.0069));  
 
   Ptr<RadioEnvironmentMapHelper> remHelper = CreateObject<RadioEnvironmentMapHelper> ();
   remHelper->SetAttribute ("ChannelPath", StringValue ("/ChannelList/0"));
   remHelper->SetAttribute ("OutputFile", StringValue ("rem.out"));
   remHelper->SetAttribute ("XMin", DoubleValue (-2000.0));
   remHelper->SetAttribute ("XMax", DoubleValue (+2000.0));
-  remHelper->SetAttribute ("XRes", UintegerValue (100));
   remHelper->SetAttribute ("YMin", DoubleValue (-500.0));
   remHelper->SetAttribute ("YMax", DoubleValue (+3500.0));
-  remHelper->SetAttribute ("YRes", UintegerValue (100));
   remHelper->SetAttribute ("Z", DoubleValue (1.5));
   remHelper->Install ();
-  // Recall the buildings helper to place the REM nodes in its position
+
+
+
   BuildingsHelper::MakeMobilityModelConsistent ();
   Simulator::Run ();
 
   // GtkConfigStore config;
   // config.ConfigureAttributes ();
 
+  lteHelper = 0;
   Simulator::Destroy ();
   return 0;
 }
--- a/src/lte/examples/lena-rem.cc	Mon Jan 30 14:09:38 2012 +0100
+++ b/src/lte/examples/lena-rem.cc	Tue Jan 31 11:51:51 2012 +0100
@@ -26,6 +26,7 @@
 #include "ns3/lte-module.h"
 #include "ns3/config-store.h"
 #include "ns3/spectrum-module.h"
+#include <ns3/buildings-helper.h>
 //#include "ns3/gtk-config-store.h"
 
 using namespace ns3;
@@ -90,10 +91,8 @@
   remHelper->SetAttribute ("OutputFile", StringValue ("rem.out"));
   remHelper->SetAttribute ("XMin", DoubleValue (-400.0));
   remHelper->SetAttribute ("XMax", DoubleValue (400.0));
-  remHelper->SetAttribute ("XRes", UintegerValue (40));
   remHelper->SetAttribute ("YMin", DoubleValue (-300.0));
   remHelper->SetAttribute ("YMax", DoubleValue (300.0));
-  remHelper->SetAttribute ("YRes", UintegerValue (30));
   remHelper->SetAttribute ("Z", DoubleValue (0.0));
   remHelper->Install ();
 
@@ -107,9 +106,10 @@
   // plot "rem.out" using ($1):($2):(10*log10($4)) with image
   
     
-
+  BuildingsHelper::MakeMobilityModelConsistent ();
 
-  Simulator::Stop (Seconds (0.020));
+ // by default, simulation will anyway stop right after the REM has been generated
+  Simulator::Stop (Seconds (0.0069));
 
   Simulator::Run ();