commit a3295ab720960ce4b73f0f5dbbd0cd887189813f
author Lucas <lucas@cs.ucla.edu> Sat Feb 04 13:36:31 2012 -0800
committer Lucas <lucas@cs.ucla.edu> Sat Feb 04 13:36:31 2012 -0800
tree 503733150cb576743ed46e2304a81c117f021bcb
parent 0b4f0e767e7ea33a24c85e0c316dc80dc1ef6211

Change the LOG type of CcnxConsumer and CcnxProducer

examples/car2car-wifi.cc

diff --git a/examples/car2car-wifi.cc b/examples/car2car-wifi.cc
index fd14266..2ef9f5e 100644
--- a/examples/car2car-wifi.cc
+++ b/examples/car2car-wifi.cc
@@ -17,8 +17,8 @@
   cmd.Parse (argc,argv);
   NodeContainer producerNode;
   producerNode.Create (1);
-  NodeContainer consumerNode;
-  consumerNode.Create(1);
+  NodeContainer consumerNodes;
+  consumerNodes.Create(2);
   YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
   YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
   phy.SetChannel (channel.Create ());
@@ -36,23 +36,21 @@
                "Ssid", SsidValue (ssid));
   */
   NetDeviceContainer consumerDevices;
-  consumerDevices = wifi.Install (phy, mac, consumerNode);
+  consumerDevices = wifi.Install (phy, mac, consumerNodes);
 
   MobilityHelper mobility;
-  mobility.SetPositionAllocator ("ns3::GridPositionAllocator",
-                                 "MinX", DoubleValue (0.0),
-                                 "MinY", DoubleValue (0.0),
-                                 "DeltaX", DoubleValue (300.0),
-                                 "DeltaY", DoubleValue (10.0),
-                                 "GridWidth", UintegerValue (3),
-                                 "LayoutType", StringValue ("RowFirst"));
+  mobility.SetPositionAllocator ("ns3::HighwayPositionAllocator",
+				 "Start", VectorValue(Vector(0.0, 0.0, 0.0)),
+				 "Direction", DoubleValue(0.0),
+				 "Length", DoubleValue(1000.0));
+  
   mobility.SetMobilityModel("ns3::ConstantVelocityMobilityModel",
 			    "ConstantVelocity", VectorValue(Vector(26.8224, 0, 0)));
   mobility.Install (producerNode);
 
   mobility.SetMobilityModel("ns3::ConstantVelocityMobilityModel",
-			    "ConstantVelocity", VectorValue(Vector(-26.8224, 0, 0)));
-  mobility.Install (consumerNode);
+			    "ConstantVelocity", VectorValue(Vector(26.8224, 0, 0)));
+  mobility.Install (consumerNodes);
 
 
   // 1. Set RoutingHelper to support prefix
@@ -91,7 +89,7 @@
   CcnxAppHelper consumerHelper ("ns3::CcnxConsumer");
   consumerHelper.SetPrefix (prefix.str ());
   consumerHelper.SetAttribute ("MeanRate", StringValue ("1Mbps"));
-  ApplicationContainer consumers = consumerHelper.Install (consumerNode);
+  ApplicationContainer consumers = consumerHelper.Install (consumerNodes);
   
   // consumers.Start (Seconds (0.0));
   // consumers.Stop (finishTime);