Browse Source

Fixes.

Former-commit-id: 267bf081c4
tempestpy_adaptions
PBerger 8 years ago
parent
commit
16e287ca8f
  1. 7
      src/storage/dd/sylvan/InternalSylvanAdd.cpp
  2. 9
      src/storage/dd/sylvan/InternalSylvanAdd.h
  3. 6
      src/storage/dd/sylvan/InternalSylvanDdManager.h

7
src/storage/dd/sylvan/InternalSylvanAdd.cpp

@ -606,6 +606,13 @@ namespace storm {
MTBDD InternalAdd<DdType::Sylvan, ValueType>::getLeaf(uint_fast64_t value) { MTBDD InternalAdd<DdType::Sylvan, ValueType>::getLeaf(uint_fast64_t value) {
return mtbdd_int64(value); return mtbdd_int64(value);
} }
template<typename ValueType>
MTBDD InternalAdd<DdType::Sylvan, ValueType>::getLeaf(storm::RationalFunction const& value) {
storm_rational_function_ptr_struct helperStruct;
helperStruct.storm_rational_function = static_cast<void*>(&value);
return sylvan::Mtbdd::terminal(sylvan_storm_rational_function_get_type(), helperStruct);
}
template<typename ValueType> template<typename ValueType>
ValueType InternalAdd<DdType::Sylvan, ValueType>::getValue(MTBDD const& node) { ValueType InternalAdd<DdType::Sylvan, ValueType>::getValue(MTBDD const& node) {

9
src/storage/dd/sylvan/InternalSylvanAdd.h

@ -13,6 +13,8 @@
#include "src/storage/expressions/Variable.h" #include "src/storage/expressions/Variable.h"
#include "src/adapters/CarlAdapter.h"
namespace storm { namespace storm {
namespace storage { namespace storage {
template<typename T> template<typename T>
@ -655,6 +657,13 @@ namespace storm {
* @return The sylvan node for the given value. * @return The sylvan node for the given value.
*/ */
static MTBDD getLeaf(uint_fast64_t value); static MTBDD getLeaf(uint_fast64_t value);
/*!
* Retrieves the sylvan representation of the given storm::RatíonalFunction value.
*
* @return The sylvan node for the given value.
*/
static MTBDD getLeaf(storm::RationalFunction const& value);
/*! /*!
* Retrieves the value of the given node (that must be a leaf). * Retrieves the value of the given node (that must be a leaf).

6
src/storage/dd/sylvan/InternalSylvanDdManager.h

@ -9,6 +9,12 @@
#include "src/adapters/CarlAdapter.h" #include "src/adapters/CarlAdapter.h"
#include "storm-config.h"
// TODO: Remove this later on.
#ifndef STORM_HAVE_CARL
#define STORM_HAVE_CARL 1
#endif
namespace storm { namespace storm {
namespace dd { namespace dd {
template<DdType LibraryType, typename ValueType> template<DdType LibraryType, typename ValueType>

Loading…
Cancel
Save