Browse Source

Fix wrong type

tempestpy_adaptions
hbruintjes 7 years ago
parent
commit
904e49dab3
  1. 2
      src/storm-dft/transformations/DftToGspnTransformator.cpp
  2. 4
      src/storm/storage/dd/DdManager.cpp

2
src/storm-dft/transformations/DftToGspnTransformator.cpp

@ -416,7 +416,7 @@ namespace storm {
cucNodes.push_back(nodeCUC);
builder.setPlaceLayoutInfo(nodeCUC, storm::gspn::LayoutInfo(xcenter-9.0+j*14.0, ycenter+5.0));
if (j > 0) {
uint64 tclaim = builder.addImmediateTransition(getFailPriority(dftSpare), 0.0, dftSpare->name() + "_claim_" + child->name());
uint64_t tclaim = builder.addImmediateTransition(getFailPriority(dftSpare), 0.0, dftSpare->name() + "_claim_" + child->name());
builder.setTransitionLayoutInfo(tclaim, storm::gspn::LayoutInfo(xcenter-9.0+j*14.0, ycenter));
builder.addInhibitionArc(unavailableNodes.at(child->id()), tclaim);
builder.addInputArc(considerNodes.back(), tclaim);

4
src/storm/storage/dd/DdManager.cpp

@ -265,7 +265,7 @@ namespace storm {
std::stringstream tmp1;
std::vector<storm::expressions::Variable> result;
for (uint64 layer = 0; layer < numberOfLayers; ++layer) {
for (uint64_t layer = 0; layer < numberOfLayers; ++layer) {
if (type == MetaVariableType::Int) {
result.emplace_back(manager->declareIntegerVariable(name + tmp1.str()));
} else if (type == MetaVariableType::Bool) {
@ -279,7 +279,7 @@ namespace storm {
std::vector<std::vector<Bdd<LibraryType>>> variables(numberOfLayers);
for (std::size_t i = 0; i < numberOfDdVariables; ++i) {
std::vector<InternalBdd<LibraryType>> ddVariables = internalDdManager.createDdVariables(numberOfLayers, level);
for (uint64 layer = 0; layer < numberOfLayers; ++layer) {
for (uint64_t layer = 0; layer < numberOfLayers; ++layer) {
variables[layer].emplace_back(Bdd<LibraryType>(*this, ddVariables[layer], {result[layer]}));
}

Loading…
Cancel
Save