From 311bc2eaa04fcd477bfb758ddefabdfa7274e807 Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 20 Sep 2016 21:21:20 +0200 Subject: [PATCH] minor first step towards input-enabling automata in JANI composition Former-commit-id: e0fbc490fcbccbfdae11c2e6f1b6635a1e255088 [formerly bf28707d897c729cfa2e854fe9bd2622e69a1275] Former-commit-id: 9534df52617143cbe78dbcb99a1b9a7d042eeb1a --- src/storage/jani/AutomatonComposition.cpp | 6 +++++- src/storage/jani/AutomatonComposition.h | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/storage/jani/AutomatonComposition.cpp b/src/storage/jani/AutomatonComposition.cpp index f8ca57212..f728ed41d 100644 --- a/src/storage/jani/AutomatonComposition.cpp +++ b/src/storage/jani/AutomatonComposition.cpp @@ -3,7 +3,7 @@ namespace storm { namespace jani { - AutomatonComposition::AutomatonComposition(std::string const& name) : name(name) { + AutomatonComposition::AutomatonComposition(std::string const& name, std::set const& inputEnabledActions) : name(name), inputEnabledActions(inputEnabledActions) { // Intentionally left empty. } @@ -15,6 +15,10 @@ namespace storm { return name; } + std::set const& AutomatonComposition::getInputEnabledActions() const { + return inputEnabledActions; + } + void AutomatonComposition::write(std::ostream& stream) const { stream << name; } diff --git a/src/storage/jani/AutomatonComposition.h b/src/storage/jani/AutomatonComposition.h index 497a85e8e..1c555ce6c 100644 --- a/src/storage/jani/AutomatonComposition.h +++ b/src/storage/jani/AutomatonComposition.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "src/storage/jani/Composition.h" namespace storm { @@ -10,7 +12,7 @@ namespace storm { /*! * Creates a reference to an automaton to be used in a composition. */ - AutomatonComposition(std::string const& name); + AutomatonComposition(std::string const& name, std::set const& inputEnabledActions = {}); /*! * Retrieves the name of the automaton this composition element refers to. @@ -21,10 +23,15 @@ namespace storm { virtual void write(std::ostream& stream) const override; + std::set const& getInputEnabledActions() const; + private: - // The name of the automaton this composition element refers to. + /// The name of the automaton this composition element refers to. std::string name; + + /// The names of the actions for which to make this automaton input-enabled. + std::set inputEnabledActions; }; } -} \ No newline at end of file +}