Merge branch '2-augment-sumoconfig-to-allow-for-fcd-output-from-sumo-launcher' into 'master'

Resolve "Augment SumoConfig to allow for fcd output from sumo launcher"

Closes #2

See merge request ezcar2x/ns3/traci!2

model/sumo-config.cc

@@ -44,6 +44,7 @@ SumoConfig::SetupCommandLine (CommandLine& cmd)
   cmd.AddValue ("sumo-load-state", "Load SUMO state from this file", m_loadState);
   cmd.AddValue ("sumo-args", "SUMO custom command line options with ':' instead of spaces", m_args);
   cmd.AddValue ("sumo-copy", "List of files to copy to the SUMO launcher, separated by ':'", m_copy);
+  cmd.AddValue ("sumo-fcd-output", "Filename for fcd output of the SUMO launcher", m_fcd_out);
 }
 
 bool
@@ -106,6 +107,12 @@ SumoConfig::GetRunArguments () const
       list.push_back (m_loadState);
     }
 
+  if (!m_fcd_out.empty ())
+    {
+      list.push_back ("--fcd-output");
+      list.push_back (m_fcd_out);
+    }
+
   if (!m_args.empty ())
     {
       traci::TokenizeString (m_args, list, m_listDelimiter);
@@ -209,5 +216,12 @@ SumoConfig::SetFilesToCopy (std::string copy)
   m_copy = copy;
 }
 
+void
+SumoConfig::SetFcdOutput (std::string fcd_file)
+{
+  m_fcd_out = fcd_file;
+}
+
+
 
 }  // namespace ns3

model/sumo-config.h

@@ -74,6 +74,7 @@ public:
    * - sumo-step
    * - sumo-args
    * - sumo-copy
+   * - sumo-fcd-output
    *
    * @param cmd		Command line object to add the parameters to
    */
@@ -177,6 +178,13 @@ public:
   void
   SetFilesToCopy (std::string copy);
 
+  /*!
+   * @brief Manually set filename for fcd output
+   * @param fcd_file	Filename for output
+   */
+  void
+  SetFcdOutput (std::string fcd_file);
+
 private:
 
   /*
@@ -213,6 +221,9 @@ private:
   //! files to copy to SUMO launcher
   std::string m_copy;
 
+  //! filename for fcd output of SUMO launcher
+  std::string m_fcd_out;
+
   /*
    * Other configuration
    */