Parcourir la source

Add parameters to graph_manager in order to pass parameters to children

Eric Ramat il y a 6 ans
Parent
commit
d83cadf55d

+ 2 - 2
src/artis-star/kernel/pdevs/Coordinator.hpp

@@ -52,11 +52,11 @@ public:
     typedef GraphParameters graph_parameters_type;
 
     Coordinator(const std::string& name,
-                const Parameters& /* parameters */,
+                const Parameters& parameters,
                 const GraphParameters& graph_parameters) :
         common::Model < Time >(name),
         common::Coordinator < Time >(name),
-        _graph_manager(this, graph_parameters)
+        _graph_manager(this, parameters, graph_parameters)
     { }
 
     virtual ~Coordinator()

+ 4 - 2
src/artis-star/kernel/pdevs/GraphManager.hpp

@@ -39,11 +39,12 @@
 namespace artis { namespace pdevs {
 
 template < class Time,
+           class Parameters = common::NoParameters,
            class GraphParameters = common::NoParameters >
 class GraphManager : public common::GraphManager < Time >
 {
 public:
-    typedef GraphManager < Time, GraphParameters > type;
+    typedef GraphManager < Time, Parameters, GraphParameters > type;
 
     struct ModelPort
     {
@@ -65,7 +66,8 @@ public:
     };
 
     GraphManager(common::Coordinator < Time >* coordinator,
-                 const GraphParameters& /* parameters */) :
+                 const Parameters& /* parameters */,
+                 const GraphParameters& /* graph_parameters */) :
         common::GraphManager < Time >(coordinator)
     { }