Browse Source

add dependencies

Former-commit-id: 50d1e41696
tempestpy_adaptions
ThomasH 9 years ago
parent
commit
fe3c4a1aa3
  1. 4
      src/CMakeLists.txt
  2. 10
      src/storage/gspn/Marking.cpp

4
src/CMakeLists.txt

@ -112,7 +112,9 @@ add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})
target_link_libraries(storm-main storm) # Adding headers for xcode target_link_libraries(storm-main storm) # Adding headers for xcode
set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm") set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm")
add_executable(storm-gspn ${STORM_GSPN_FILE}) add_executable(storm-gspn ${STORM_GSPN_FILE})
target_link_libraries(storm-gspn storm)
# CoreFoundation and CoreServices are linked for the XercesDOMParser
# libcurl ist needed for the xercesc library, but the dependency is missing (maybe resolved in the next version)
target_link_libraries(storm-gspn storm "-framework CoreFoundation -framework CoreServices -lcurl")
target_link_libraries(storm ${STORM_LINK_LIBRARIES}) target_link_libraries(storm ${STORM_LINK_LIBRARIES})

10
src/storage/gspn/Marking.cpp

@ -19,7 +19,7 @@ namespace storm {
} }
void Marking::setNumberOfTokensAt(uint_fast64_t place, uint_fast64_t numberOfTokens) { void Marking::setNumberOfTokensAt(uint_fast64_t place, uint_fast64_t numberOfTokens) {
//check range
//TODO check range (place < getNumberOfPlaces(), numberOfTokens < getMaxNumberOfTokens())
for (uint_fast64_t i = place * numberOfBits; i <(place * numberOfBits) + numberOfBits; ++i) { for (uint_fast64_t i = place * numberOfBits; i <(place * numberOfBits) + numberOfBits; ++i) {
if (numberOfTokens % 2 == 0) { if (numberOfTokens % 2 == 0) {
marking.set(i, false); marking.set(i, false);
@ -39,5 +39,13 @@ namespace storm {
} }
return tokens; return tokens;
} }
bool Marking::setNumberOfPlaces(uint_fast64_t numberOfPlaces) {
return false;
}
bool Marking::setMaxNumberOfTokens(uint_fast64_t maxNumberOfTokens) {
return false;
}
} }
} }
Loading…
Cancel
Save