add command line parsing to helics example

contrib/helics/examples/helics-example.cc

@@ -12,18 +12,20 @@ main (int argc, char *argv[])
 {
   bool verbose = true;
 
+  HelicsHelper helics;
+
   CommandLine cmd;
   cmd.AddValue ("verbose", "Tell application to log if true", verbose);
-
+  helics.SetupCommandLine(cmd);
   cmd.Parse (argc,argv);
 
   GlobalValue::Bind ("SimulatorImplementationType", StringValue ("ns3::HelicsSimulatorImpl"));
 
-  HelicsHelper helics;
   helics.SetupFederate();
   NS_LOG_INFO ("Simulator Impl bound, about to Run simulator");
 
   Simulator::Run ();
+  Simulator::Stop (Seconds (10.0));
   Simulator::Destroy ();
   return 0;
 }

contrib/helics/helper/helics-helper.cc

@@ -8,15 +8,40 @@
 
 namespace ns3 {
 
+HelicsHelper::HelicsHelper()
+: broker("")
+, name("ns3")
+, core("zmq")
+, stop(1.0)
+, timedelta(1.0)
+, coreinit("")
+{
+}
+
 void
 HelicsHelper::SetupFederate(void)
 {
-  helics::FederateInfo fi ("ns3");
-  fi.coreType = helics::coreTypeFromString ("zmq");
+  helics::FederateInfo fi (name);
+  fi.coreType = helics::coreTypeFromString (core);
   //fi.coreInitString = "--broker=" + "brokid" + " --broker_address=" + "addr" + " --federates 1";
-  fi.coreInitString = "--federates 1";
+  //fi.coreInitString = "--federates 1";
+  fi.timeDelta = timedelta;
+  if (!coreinit.empty()) {
+    fi.coreInitString = coreinit;
+  }
   federate = std::make_shared<helics::MessageFederate> (fi);
 }
 
+void
+HelicsHelper::SetupCommandLine(CommandLine &cmd)
+{
+  cmd.AddValue ("broker", "address to connect the broker to", broker);
+  cmd.AddValue ("name", "name of the ns3 federate", name);
+  cmd.AddValue ("core", "name of the core to connect to", core);
+  cmd.AddValue ("stop", "the time to stop the player", stop);
+  cmd.AddValue ("timedelta", "the time delta of the federate", timedelta);
+  cmd.AddValue ("coreinit", "the core initializion string", coreinit);
+}
+
 }
 

contrib/helics/helper/helics-helper.h

@@ -2,13 +2,25 @@
 #ifndef HELICS_HELPER_H
 #define HELICS_HELPER_H
 
+#include "ns3/core-module.h"
 #include "ns3/helics.h"
 
 namespace ns3 {
 
 class HelicsHelper {
 public:
+  HelicsHelper();
   void SetupFederate(void);
+  void SetupCommandLine(CommandLine &cmd);
+
+private:
+  std::string broker;
+  std::string name;
+  std::string type;
+  std::string core;
+  double stop;
+  double timedelta;
+  std::string coreinit;
 };
 
 }

contrib/helics/model/helics-simulator-impl.cc

@@ -231,6 +231,7 @@ HelicsSimulatorImpl::Run (void)
   federate->enterExecutionState ();
 
   // Requests time of next event, or max simulation time if nothing in the queue
+  NS_LOG_INFO ("Requesting time");
   Time grantedTime = Time::FromDouble (federate->requestTime (Next ().GetSeconds ()), Time::S);
   Time nextTime = Next ();
 

contrib/helics/wscript

@@ -124,6 +124,14 @@ int main()
         # if they are enabled.
         conf.env['MODULES_NOT_BUILT'].append('helics')
 
+    # if HELICS is enabled, we must use c++14 instead of c++11
+    if conf.env['HELICS']:
+        for index,flag in enumerate(conf.env['CXXFLAGS']):
+            if 'c++11' in flag:
+                conf.env['CXXFLAGS'][index] = '-std=c++14'
+                break
+        print(conf.env['CXXFLAGS'])
+
 def build(bld):
     if 'helics' in bld.env['MODULES_NOT_BUILT']:
         return