浏览代码

Upgrade tests

Eric Ramat 11 年之前
父节点
当前提交
d42efb12c0
共有 4 个文件被更改,包括 68 次插入32 次删除
  1. 16 7
      src/tests/boost_graph/models.hpp
  2. 16 6
      src/tests/dtss/models.hpp
  3. 26 14
      src/tests/mixed/models.hpp
  4. 10 5
      src/tests/pdevs/models.hpp

+ 16 - 7
src/tests/boost_graph/models.hpp

@@ -44,7 +44,8 @@ public:
     TopPixel(const std::string& name,
              const TopPixelParameters& parameters) :
         paradevs::pdevs::Dynamics < common::DoubleTime, SchedulerHandle,
-                                    TopPixelParameters >(name, parameters)
+                                    TopPixelParameters >(name, parameters),
+        _value(0)
     { }
 
     virtual ~TopPixel()
@@ -60,7 +61,9 @@ public:
 
     virtual typename common::DoubleTime::type start(
         typename common::DoubleTime::type /* t */)
-    { return 0; }
+    {
+        return 0;
+    }
 
     virtual typename common::DoubleTime::type ta(
         typename common::DoubleTime::type /* t */) const
@@ -75,10 +78,14 @@ public:
 
         common::Bag < common::DoubleTime, SchedulerHandle > bag;
 
-        bag.push_back(common::ExternalEvent < common::DoubleTime,
-                                              SchedulerHandle >("out", 0.));
+        bag.push_back(common::ExternalEvent <
+                          common::DoubleTime, SchedulerHandle >(
+                              "out", (void*)&_value));
         return bag;
     }
+
+private:
+    double _value;
 };
 
 struct NormalPixelParameters
@@ -99,7 +106,7 @@ public:
              const NormalPixelParameters& parameters) :
         paradevs::pdevs::Dynamics < common::DoubleTime, SchedulerHandle,
                                     NormalPixelParameters >(name, parameters),
-        _neighbour_number(parameters._neighbour_number)
+        _neighbour_number(parameters._neighbour_number), _value(0)
     { }
 
     virtual ~NormalPixel()
@@ -186,8 +193,9 @@ public:
         common::Bag < common::DoubleTime, SchedulerHandle > bag;
 
         if (_phase == SEND) {
-            bag.push_back(common::ExternalEvent < common::DoubleTime,
-                                                  SchedulerHandle >("out", 0.));
+            bag.push_back(common::ExternalEvent <
+                              common::DoubleTime, SchedulerHandle >(
+                                  "out", (void*)&_value));
         }
         return bag;
     }
@@ -196,6 +204,7 @@ private:
     enum Phase { WAIT, SEND };
 
     unsigned int _neighbour_number;
+    double       _value;
 
     Phase                             _phase;
     unsigned int                      _received;

+ 16 - 6
src/tests/dtss/models.hpp

@@ -43,7 +43,8 @@ public:
       const paradevs::common::NoParameters& parameters) :
         paradevs::dtss::Dynamics < common::DoubleTime, SchedulerHandle,
                                    paradevs::common::NoParameters >(name,
-                                                                    parameters)
+                                                                    parameters),
+        _value(0)
     { }
     virtual ~A()
     { }
@@ -95,8 +96,9 @@ public:
 
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", 0.));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -109,6 +111,9 @@ public:
 
         return msgs;
     }
+
+private:
+    double _value;
 };
 
 template < class SchedulerHandle>
@@ -121,7 +126,8 @@ public:
       const paradevs::common::NoParameters& parameters) :
         paradevs::dtss::Dynamics < common::DoubleTime, SchedulerHandle,
                                    paradevs::common::NoParameters >(name,
-                                                                    parameters)
+                                                                    parameters),
+        _value(0)
     { }
     virtual ~B()
     { }
@@ -174,8 +180,9 @@ public:
 
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", 0.));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -188,6 +195,9 @@ public:
 
         return msgs;
     }
+
+private:
+    double _value;
 };
 
 } } } // namespace paradevs tests dtss

+ 26 - 14
src/tests/mixed/models.hpp

@@ -46,7 +46,7 @@ public:
        const paradevs::common::NoParameters& parameters) :
         paradevs::pdevs::Dynamics < common::DoubleTime, SchedulerHandle,
                                     paradevs::common::NoParameters >(
-                                        name, parameters)
+                                        name, parameters), _value(0)
     { }
     virtual ~A1()
     { }
@@ -157,8 +157,9 @@ public:
 
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", 0.));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -175,6 +176,7 @@ private:
     enum Phase { WAIT, SEND };
 
     Phase _phase;
+    double _value;
 };
 
 template < class SchedulerHandle>
@@ -301,8 +303,9 @@ public:
 #endif
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", t));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&t));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -330,7 +333,7 @@ public:
        const paradevs::common::NoParameters& parameters) :
         paradevs::dtss::Dynamics < common::DoubleTime, SchedulerHandle,
                                    paradevs::common::NoParameters >(
-                                       name, parameters)
+                                       name, parameters), _value(0)
     { }
     virtual ~A2()
     { }
@@ -383,7 +386,7 @@ public:
 
         msgs.push_back(
             common::ExternalEvent < common::DoubleTime,
-                                    SchedulerHandle >( "out", 0.));
+                                    SchedulerHandle >( "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -395,6 +398,9 @@ public:
 
         return msgs;
     }
+
+private:
+    double _value;
 };
 
 template < class SchedulerHandle >
@@ -406,7 +412,7 @@ public:
        const paradevs::common::NoParameters& parameters) :
         paradevs::dtss::Dynamics < common::DoubleTime, SchedulerHandle,
                                    paradevs::common::NoParameters >(
-                                       name, parameters)
+                                       name, parameters), _value(0)
     { }
     virtual ~B2()
     { }
@@ -459,7 +465,7 @@ public:
 
         msgs.push_back(
             common::ExternalEvent < common::DoubleTime,
-                                    SchedulerHandle >("out", 0.));
+                                    SchedulerHandle >("out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -471,6 +477,9 @@ public:
 
         return msgs;
     }
+
+private:
+    double _value;
 };
 
 template < class SchedulerHandle>
@@ -481,9 +490,10 @@ class Beep :
 public:
     Beep(const std::string& name,
          const paradevs::common::NoParameters& parameters) :
-        paradevs::pdevs::Dynamics < common::DoubleTime, SchedulerHandle,
-                                    paradevs::common::NoParameters >(name,
-                                                                     parameters)
+        paradevs::pdevs::Dynamics < common::DoubleTime,
+                                    SchedulerHandle,
+                                    paradevs::common::NoParameters >(
+                                        name, parameters), _value(0)
     { }
     virtual ~Beep()
     { }
@@ -597,8 +607,9 @@ public:
 #endif
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", 0.));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -615,6 +626,7 @@ private:
     enum Phase { WAIT, SEND };
 
     Phase _phase;
+    double _value;
 };
 
 } } } // namespace paradevs tests mixed

+ 10 - 5
src/tests/pdevs/models.hpp

@@ -57,7 +57,8 @@ class A :
 public:
     A(const std::string& name, const common::NoParameters& parameters) :
         paradevs::pdevs::Dynamics < common::DoubleTime,
-                                    SchedulerHandle >(name, parameters)
+                                    SchedulerHandle >(name, parameters),
+        _value(0)
     { }
     virtual ~A()
     { }
@@ -179,7 +180,7 @@ public:
 
         msgs.push_back(
             common::ExternalEvent < common::DoubleTime, SchedulerHandle >(
-                "out", 0.));
+                "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -200,6 +201,7 @@ private:
     enum Phase { WAIT, SEND };
 
     Phase _phase;
+    double _value;
 };
 
 template < class SchedulerHandle >
@@ -209,7 +211,8 @@ class B :
 public:
     B(const std::string& name, const common::NoParameters& parameters) :
         paradevs::pdevs::Dynamics < common::DoubleTime,
-                                    SchedulerHandle >(name, parameters)
+                                    SchedulerHandle >(name, parameters),
+        _value(0)
     { }
     virtual ~B()
     { }
@@ -328,8 +331,9 @@ public:
 #endif
         common::Bag < common::DoubleTime, SchedulerHandle > msgs;
 
-        msgs.push_back(common::ExternalEvent < common::DoubleTime,
-                                               SchedulerHandle >("out", 0.));
+        msgs.push_back(common::ExternalEvent <
+                           common::DoubleTime, SchedulerHandle >(
+                               "out", (void*)&_value));
 
 #ifdef WITH_TRACE
         common::Trace < common::DoubleTime >::trace()
@@ -350,6 +354,7 @@ private:
     enum Phase { WAIT, SEND };
 
     Phase _phase;
+    double _value;
 };
 
 } } } // namespace paradevs tests pdevs