sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Again some progress 

Former-commit-id: 3b3dd48ea8
tempestpy_adaptions
mdeutschen 8 years ago
committed by Sebastian Junges
parent
e5a485a930
commit
e6d1b13718
3 changed files with 108 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      examples/dft/spare10.dft
  2. 107
      src/transformations/dft/DftToGspnTransformator.cpp
  3. 2
      src/transformations/dft/DftToGspnTransformator.h

11
examples/dft/spare10.dft
View File

@ -0,0 +1,11 @@
toplevel "SPARE";
"SPARE" wsp "PC" "FSC" "SSC";
"PC" or "A" "B";
"B" or "C" "D" "E";
"FSC" lambda=0.5 dorm=0.3;
"SSC" lambda=0.5 dorm=0.3;
"A" lambda=0.5 dorm=0.3;
"C" lambda=0.5 dorm=0.3;
"D" lambda=0.5 dorm=0.3;
"E" lambda=0.5 dorm=0.3;

107
src/transformations/dft/DftToGspnTransformator.cpp
View File

@ -472,13 +472,21 @@ namespace storm {
}
case storm::storage::DFTElementType::SPARE:
{
// TODO: Implement.
// Check if current child is a primary or spare child.
auto children = std::static_pointer_cast<storm::storage::DFTSpare<ValueType> const>(mDft.getElement(parents[j]))->children();
if (child == children[0]) { // Primary child.
// TODO: Draw line from "FC_activating" to every BE, that is connected to the primary child.
auto spareExit = mGspn.getImmediateTransition(child->name() + STR_ACTIVATING);
std::vector<int> ids = getAllBEIDsOfElement(child);
for (std::size_t k = 0; k < ids.size(); k++) {
auto childEntry = mGspn.getPlace(mDft.getElement(ids[k])->name() + STR_ACTIVATED);
if (spareExit.first && childEntry.first) { // Only add arcs if the objects have been found.
spareExit.second->setInhibitionArcMultiplicity(childEntry.second, 1);
spareExit.second->setOutputArcMultiplicity(childEntry.second, 1);
}
}
// Draw lines from "primary child_failed" to SPARE.
auto childExit = mGspn.getPlace(child->name() + STR_FAILED);
@ -496,6 +504,9 @@ namespace storm {
else { // A spare child.
// TODO: Draw line from "SC_activating" to every BE, that is connected to the spare child.
// TODO: End.
auto childExit = mGspn.getPlace(child->name() + STR_FAILED);
auto spareEntry = mGspn.getImmediateTransition(mDft.getElement(parents[j])->name() + "_claiming_" + child->name());
auto spareEntry2 = mGspn.getImmediateTransition(child->name() + STR_ACTIVATING);
@ -789,17 +800,91 @@ namespace storm {
}
template <typename ValueType>
std::vector<int> DftToGspnTransformator<ValueType>::getAllBEIDsOfElement(std::vector<int> ids, std::shared_ptr<storm::storage::DFTElement<ValueType> const> dftElement) {
std::vector<int> newIds;
std::vector<int> DftToGspnTransformator<ValueType>::getAllBEIDsOfElement(std::shared_ptr<storm::storage::DFTElement<ValueType> const> dftElement) {
std::vector<int> ids;
if (dftElement->type() == storm::storage::DFTElementType::BE) {
newIds.push_back(dftElement->id());
}
else {
// TODO: Check all children: If they are BEs, add them to the list. Else, check the children again.
switch (dftElement->type()) {
case storm::storage::DFTElementType::AND:
{
auto children = std::static_pointer_cast<storm::storage::DFTAnd<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::OR:
{
auto children = std::static_pointer_cast<storm::storage::DFTOr<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::VOT:
{
auto children = std::static_pointer_cast<storm::storage::DFTVot<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::PAND:
{
auto children = std::static_pointer_cast<storm::storage::DFTPand<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::SPARE:
{
auto children = std::static_pointer_cast<storm::storage::DFTSpare<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::POR:
{
auto children = std::static_pointer_cast<storm::storage::DFTPor<ValueType> const>(dftElement)->children();
for (std::size_t i = 0; i < children.size(); i++) {
std::vector<int> newIds = getAllBEIDsOfElement(children[i]);
ids.insert(ids.end(), newIds.begin(), newIds.end());
}
break;
}
case storm::storage::DFTElementType::BE:
case storm::storage::DFTElementType::CONSTF:
case storm::storage::DFTElementType::CONSTS:
{
ids.push_back(dftElement->id());
break;
}
case storm::storage::DFTElementType::SEQ:
case storm::storage::DFTElementType::MUTEX:
case storm::storage::DFTElementType::PDEP:
{
break;
}
default:
{
STORM_LOG_ASSERT(false, "DFT type unknown.");
break;
}
}
return newIds;
return ids;
}
template <typename ValueType>

2
src/transformations/dft/DftToGspnTransformator.h
View File

@ -205,7 +205,7 @@ namespace storm {
*
* @param dftElement The element which
*/
std::vector<int> getAllBEIDsOfElement(std::vector<int> ids, std::shared_ptr<storm::storage::DFTElement<ValueType> const> dftElement);
std::vector<int> getAllBEIDsOfElement(std::shared_ptr<storm::storage::DFTElement<ValueType> const> dftElement);
};
}
}

Write Preview
Loading…
Cancel
Save