commit ae3b7c3e617fc385f09eb4a3c174e08d5fbd8f59
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 13 13:20:06 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 13 13:24:29 2011 -0800
tree e0cb0f1f6832b482e3507150f2f0d643b4cfabc0
parent dd3eeecb505e15de2ccbc5cd559fb5f149bf029f

Simplified and unified implementation of RocketfuelWeightReader

examples/sprint-topology.cc

diff --git a/examples/sprint-topology.cc b/examples/sprint-topology.cc
index ba3d484..5efffeb 100644
--- a/examples/sprint-topology.cc
+++ b/examples/sprint-topology.cc
@@ -30,7 +30,6 @@
 #include <sstream>
 #include "ns3/rocketfuel-topology-reader.h"
 
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("CcnxSprintTopology");
@@ -40,43 +39,31 @@
 {
     Packet::EnableChecking();
     Packet::EnablePrinting();
-    std::string input ("./src/NDNabstraction/examples/sprint.weights");
+    std::string weights ("./src/NDNabstraction/examples/sprint.weights");
+    std::string latencies ("./src/NDNabstraction/examples/sprint.latencies");
     
     // ------------------------------------------------------------
     // -- Read topology data.
     // --------------------------------------------
     
-    Ptr<RocketfuelWeightsReader> reader = CreateObject<RocketfuelWeightsReader> ();
-    reader->SetFileName (input);
+    RocketfuelWeightsReader reader;
+
+    reader.SetFileName (weights);
+    reader.SetFileType (RocketfuelWeightsReader::WEIGHTS);    
+    NodeContainer nodes = reader.Read ();
+
+    reader.SetFileName (latencies);
+    reader.SetFileType (RocketfuelWeightsReader::LATENCIES);    
+    reader.Read ();
     
-    NodeContainer nodes;
-    if (reader != 0)
-    {
-        nodes = reader->Read ("./src/NDNabstraction/examples/sprint.latencies");
-    }
-    
-    if (reader->LinksSize () == 0)
+    if (reader.LinksSize () == 0)
     {
         NS_LOG_ERROR ("Problems reading the topology file. Failing.");
         return -1;
     }
     
     NS_LOG_INFO("Nodes = " << nodes.GetN());
-    NS_LOG_INFO("Links = " << reader->LinksSize ());
-    
-    int totlinks = reader->LinksSize ();
-    ///*** applying settings
-    NS_LOG_INFO ("creating node containers");
-    NodeContainer* nc = new NodeContainer[totlinks];
-    TopologyReader::ConstLinksIterator iter;
-    int i = 0;
-    for ( iter = reader->LinksBegin (); iter != reader->LinksEnd (); iter++, i++ )
-    {
-        nc[i] = NodeContainer (iter->GetFromNode (), iter->GetToNode ());
-    }
-    
-    NetDeviceContainer* ndc = new NetDeviceContainer[totlinks];
-    reader->ApplySettings(ndc,nc);
+    NS_LOG_INFO("Links = " << reader.LinksSize ());
     
     NS_LOG_INFO ("Run Simulation.");
     Simulator::Run ();