Browse Source

symbolic and sparse models now have a public member `Representation`

tempestpy_adaptions
Tim Quatmann 3 years ago
committed by Stefan Pranger
parent
commit
1207af13a2
  1. 2
      src/storm/models/sparse/Model.h
  2. 3
      src/storm/models/symbolic/Model.h

2
src/storm/models/sparse/Model.h

@ -6,6 +6,7 @@
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include "storm/models/Model.h" #include "storm/models/Model.h"
#include "storm/models/ModelRepresentation.h"
#include "storm/models/sparse/StateLabeling.h" #include "storm/models/sparse/StateLabeling.h"
#include "storm/models/sparse/ChoiceLabeling.h" #include "storm/models/sparse/ChoiceLabeling.h"
#include "storm/storage/sparse/ModelComponents.h" #include "storm/storage/sparse/ModelComponents.h"
@ -34,6 +35,7 @@ namespace storm {
public: public:
typedef CValueType ValueType; typedef CValueType ValueType;
typedef CRewardModelType RewardModelType; typedef CRewardModelType RewardModelType;
static const storm::models::ModelRepresentation Representation = ModelRepresentation::Sparse;
Model(Model<ValueType, RewardModelType> const& other) = default; Model(Model<ValueType, RewardModelType> const& other) = default;
Model& operator=(Model<ValueType, RewardModelType> const& other) = default; Model& operator=(Model<ValueType, RewardModelType> const& other) = default;

3
src/storm/models/symbolic/Model.h

@ -12,6 +12,7 @@
#include "storm/storage/dd/Add.h" #include "storm/storage/dd/Add.h"
#include "storm/storage/dd/Bdd.h" #include "storm/storage/dd/Bdd.h"
#include "storm/models/Model.h" #include "storm/models/Model.h"
#include "storm/models/ModelRepresentation.h"
#include "storm/utility/OsDetection.h" #include "storm/utility/OsDetection.h"
#include "storm-config.h" #include "storm-config.h"
@ -50,6 +51,8 @@ namespace storm {
static const storm::dd::DdType DdType = Type; static const storm::dd::DdType DdType = Type;
typedef StandardRewardModel<Type, ValueType> RewardModelType; typedef StandardRewardModel<Type, ValueType> RewardModelType;
static const storm::models::ModelRepresentation Representation = GetModelRepresentation<DdType>::representation;
Model(Model<Type, ValueType> const& other) = default; Model(Model<Type, ValueType> const& other) = default;
Model& operator=(Model<Type, ValueType> const& other) = default; Model& operator=(Model<Type, ValueType> const& other) = default;

Loading…
Cancel
Save