commit 011b8591c0b50ff0f675ee997929b28aa0698f37
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 21 14:45:27 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 21 14:45:27 2011 -0800
tree f64f291ba3f16897801955fb8e3f2bc1a439a9ba
parent 4975f7323ecaadff7362b8ab68b682eb5d8d422d

Implementing Poisson Process for consumer requests (exponential distribution for inter-arrival times)

model/annotated-topology-reader.cc

diff --git a/model/annotated-topology-reader.cc b/model/annotated-topology-reader.cc
index edcff58..2ca17eb 100644
--- a/model/annotated-topology-reader.cc
+++ b/model/annotated-topology-reader.cc
@@ -52,10 +52,11 @@
 
 NS_LOG_COMPONENT_DEFINE ("AnnotatedTopologyReader");
     
-AnnotatedTopologyReader::AnnotatedTopologyReader (const std::string &path)
+AnnotatedTopologyReader::AnnotatedTopologyReader (const std::string &path, double scale/*=1.0*/)
   : m_path (path)
   , m_randX (0, 100.0)
   , m_randY (0, 100.0)
+  , m_scale (scale)
 {
   NS_LOG_FUNCTION (this);
 
@@ -137,7 +138,7 @@
       double latitude, longitude;
 
       lineBuffer >> name >> city >> latitude >> longitude;
-      Ptr<Node> node = CreateNode (name, longitude, -latitude);
+      Ptr<Node> node = CreateNode (name, m_scale*longitude, -m_scale*latitude);
       nodes.Add (node);
     }
 

model/annotated-topology-reader.h

diff --git a/model/annotated-topology-reader.h b/model/annotated-topology-reader.h
index 4bacd2a..cbcd890 100644
--- a/model/annotated-topology-reader.h
+++ b/model/annotated-topology-reader.h
@@ -39,10 +39,11 @@
    * \brief Constructor
    *
    * \param path ns3::Names path
+   * \param scale Scaling factor for coordinates in input file
    *
    * \see ns3::Names class
    */
-  AnnotatedTopologyReader (const std::string &path="");
+  AnnotatedTopologyReader (const std::string &path="", double scale=1.0);
   virtual ~AnnotatedTopologyReader ();
         
   /**
@@ -100,6 +101,7 @@
   UniformVariable m_randY;
 
   ObjectFactory m_mobilityFactory;
+  double m_scale;
 };
 
 }