Clean main program

src/CMakeLists.txt

@@ -5,6 +5,5 @@ ELSE ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   message("TRACE off")
 ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 
-#ADD_SUBDIRECTORY(apps)
+ADD_SUBDIRECTORY(apps)
 ADD_SUBDIRECTORY(paradevs)
-#ADD_SUBDIRECTORY(tests)

src/apps/main.cpp

@@ -24,142 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boost/timer/timer.hpp>
-
-#include <common/RootCoordinator.hpp>
-#include <common/scheduler/VectorScheduler.hpp>
-#include <common/scheduler/HeapScheduler.hpp>
-
-#include <kernel/pdevs/Coordinator.hpp>
-
-#include <tests/mixed/models.hpp>
-#include <tests/mixed/graph_manager.hpp>
-
-using namespace paradevs::tests::mixed;
-
-template < int size >
-void run_flat_with_heap()
-{
-    boost::timer::cpu_timer t;
-
-    std::cout << "run_flat_with_heap [" << size << "] ..." << std::endl;
-
-    paradevs::common::RootCoordinator <
-        paradevs::common::DoubleTime, paradevs::pdevs::Coordinator <
-            paradevs::common::DoubleTime,
-            paradevs::common::scheduler::HeapScheduler <
-                paradevs::common::DoubleTime, SchedulerHandle >,
-            SchedulerHandle,
-            LinearGraphManager < size, SchedulerHandle > >
-        > rc(0, 100, "root", paradevs::common::NoParameters(),
-             paradevs::common::NoParameters());
-
-    paradevs::common::Trace < paradevs::common::DoubleTime >::trace().clear();
-    rc.run();
-
-    std::cout << "... OK -> " << t.elapsed().user << std::endl;
-}
-
-template < int size >
-void run_flat_with_vector()
-{
-    boost::timer::cpu_timer t;
-
-    std::cout << "run_flat_with_vector [" << size << "] ..." << std::endl;
-
-    paradevs::common::RootCoordinator <
-        paradevs::common::DoubleTime, paradevs::pdevs::Coordinator <
-            paradevs::common::DoubleTime,
-            paradevs::common::scheduler::VectorScheduler <
-                paradevs::common::DoubleTime >,
-            paradevs::common::scheduler::NoSchedulerHandle,
-            LinearGraphManager <
-                size, paradevs::common::scheduler::NoSchedulerHandle > >
-        > rc(0, 100, "root", paradevs::common::NoParameters(),
-             paradevs::common::NoParameters());
-
-    paradevs::common::Trace < paradevs::common::DoubleTime >::trace().clear();
-    rc.run();
-
-    std::cout << "... OK -> " << t.elapsed().user << std::endl;
-}
-
-void run_hierarchic_with_heap()
-{
-    paradevs::common::RootCoordinator <
-        paradevs::common::DoubleTime, paradevs::pdevs::Coordinator <
-            paradevs::common::DoubleTime,
-            paradevs::common::scheduler::HeapScheduler <
-                paradevs::common::DoubleTime, SchedulerHandle >,
-            SchedulerHandle,
-            Root2GraphManager >
-        > rc(0, 100, "root", paradevs::common::NoParameters(),
-             paradevs::common::NoParameters());
-
-    paradevs::common::Trace < paradevs::common::DoubleTime >::trace().clear();
-    rc.run();
-}
-
-void run_hierarchic_with_vector()
-{
-    paradevs::common::RootCoordinator <
-        paradevs::common::DoubleTime, paradevs::pdevs::Coordinator <
-            paradevs::common::DoubleTime,
-            paradevs::common::scheduler::VectorScheduler <
-                paradevs::common::DoubleTime >,
-            paradevs::common::scheduler::NoSchedulerHandle,
-            Root3GraphManager >
-        > rc(0, 100, "root", paradevs::common::NoParameters(),
-             paradevs::common::NoParameters());
-
-    paradevs::common::Trace < paradevs::common::DoubleTime >::trace().clear();
-    rc.run();
-}
-
 int main()
 {
-    boost::timer::cpu_timer t;
-
-    srand(108364);
-
-    run_flat_with_heap < 10 >();
-    run_flat_with_heap < 20 >();
-    run_flat_with_heap < 30 >();
-    run_flat_with_heap < 40 >();
-    run_flat_with_heap < 50 >();
-    run_flat_with_heap < 60 >();
-    run_flat_with_heap < 70 >();
-    run_flat_with_heap < 80 >();
-    run_flat_with_heap < 90 >();
-    run_flat_with_heap < 100 >();
-    run_flat_with_heap < 200 >();
-
-    run_flat_with_vector < 10 >();
-    run_flat_with_vector < 20 >();
-    run_flat_with_vector < 30 >();
-    run_flat_with_vector < 40 >();
-    run_flat_with_vector < 50 >();
-    run_flat_with_vector < 60 >();
-    run_flat_with_vector < 70 >();
-    run_flat_with_vector < 80 >();
-    run_flat_with_vector < 90 >();
-    run_flat_with_vector < 100 >();
-    run_flat_with_vector < 200 >();
-
-    double t2 = t.elapsed().user;
-
-    std::cout << "run_hierarchic_with_heap ..." << std::endl;
-    run_hierarchic_with_heap();
-
-    double t3 = t.elapsed().user;
-
-    std::cout << "... OK -> " << (t3 - t2) << std::endl;
-    std::cout << "run_hierarchic_with_vector ..." << std::endl;
-    run_hierarchic_with_vector();
-
-    double t4 = t.elapsed().user;
-
-    std::cout << "... OK -> "  << (t4 - t3) << std::endl;
-
     return 0;
 }