diff --git a/src/CMakeFiles/factory_core.dir/Processor.cpp.o b/src/CMakeFiles/factory_core.dir/Processor.cpp.o index b8379b7..3b1610d 100644 Binary files a/src/CMakeFiles/factory_core.dir/Processor.cpp.o and b/src/CMakeFiles/factory_core.dir/Processor.cpp.o differ diff --git a/src/Processor.cpp b/src/Processor.cpp index 8316ff9..d9e5322 100644 --- a/src/Processor.cpp +++ b/src/Processor.cpp @@ -30,32 +30,42 @@ namespace artis::factory { void Processor::dint(const Time & /* t */) { // TODO + // Fonction que gère les évolutions internes de ce modèle } void Processor::dext(const Time & /* t */, const Time & /* e */, const Bag &bag) { std::for_each(bag.begin(), bag.end(), [](const ExternalEvent & /* event */) { // TODO + // Fonction gérant les réponses du système aux évents passés via event() }); } -void Processor::start(const Time & /* t */) { - // TODO +void Processor::start(const Time &t) { + // Démarrage et initialisation + + this->currentState = this->ProcessorState::INIT; // ID de la phase d'état du modèle + this->startTime = t; + + } Time Processor::ta(const Time & /* t */) const { // TODO + // Temps passé dans l'état actuel return artis::common::DoubleTime::infinity; } Bag Processor::lambda(const Time & /* t */) const { - Bag bag; + Bag bag; + // L'ensemble des sorties de cet objet // TODO return bag; } artis::common::event::Value Processor::observe(const Time & /* t */, unsigned int /* index */) const { + // Print de l'état actuel ? return {}; } -} // namespace artis::factory \ No newline at end of file +} // namespace artis::factory diff --git a/src/Processor.hpp b/src/Processor.hpp index 408ddbd..03cbe9d 100644 --- a/src/Processor.hpp +++ b/src/Processor.hpp @@ -78,10 +78,21 @@ public: artis::common::event::Value observe(const Time &t, unsigned int index) const override; + enum ProcessorState{ + INIT, + WAIT, + LOADING, + PROCESSING, + UNLOADING, + READY + }; + private: // TODO (state) + ProcessorState currentState; + Time startTime; }; } // namespace artis::factory -#endif \ No newline at end of file +#endif diff --git a/src/libfactory_core.a b/src/libfactory_core.a index 3b40bfc..7ef3242 100644 Binary files a/src/libfactory_core.a and b/src/libfactory_core.a differ diff --git a/test/CMakeFiles/test_simple.dir/test_simple.cpp.o b/test/CMakeFiles/test_simple.dir/test_simple.cpp.o index 7511570..5ddbb19 100644 Binary files a/test/CMakeFiles/test_simple.dir/test_simple.cpp.o and b/test/CMakeFiles/test_simple.dir/test_simple.cpp.o differ diff --git a/test/test_simple b/test/test_simple index 0b92780..f8bc515 100755 Binary files a/test/test_simple and b/test/test_simple differ