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

Wrapper for file opening

main
Matthias Volk 8 years ago
parent
75130ab727
commit
5d79eff2cd
29 changed files with 188 additions and 182 deletions
Unified View
  1. 23
      src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
  2. 17
      src/storm-dft/parser/DFTGalileoParser.cpp
  3. 14
      src/storm-dft/parser/DFTJsonParser.cpp
  4. 8
      src/storm-gspn-cli/storm-gspn.cpp
  5. 20
      src/storm-gspn/storm-gspn.h
  6. 11
      src/storm-pgcl-cli/storm-pgcl.cpp
  7. 9
      src/storm-pgcl/parser/PgclParser.cpp
  8. 5
      src/storm/abstraction/MenuGameAbstractor.cpp
  9. 8
      src/storm/cli/entrypoints.h
  10. 5
      src/storm/modelchecker/region/ParameterRegion.cpp
  11. 5
      src/storm/parser/AtomicPropositionLabelingParser.cpp
  12. 5
      src/storm/parser/DeterministicSparseTransitionParser.cpp
  13. 9
      src/storm/parser/FormulaParser.cpp
  14. 14
      src/storm/parser/JaniParser.cpp
  15. 18
      src/storm/parser/MappedFile.cpp
  16. 8
      src/storm/parser/MappedFile.h
  17. 5
      src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
  18. 5
      src/storm/parser/NondeterministicSparseTransitionParser.cpp
  19. 10
      src/storm/parser/PrismParser.cpp
  20. 5
      src/storm/parser/SparseChoiceLabelingParser.cpp
  21. 5
      src/storm/parser/SparseStateRewardParser.cpp
  22. 8
      src/storm/settings/SettingsManager.cpp
  23. 13
      src/storm/solver/SmtlibSmtSolver.cpp
  24. 6
      src/storm/storage/dd/Odd.cpp
  25. 18
      src/storm/storage/jani/JSONExporter.cpp
  26. 15
      src/storm/utility/export.h
  27. 81
      src/storm/utility/file.h
  28. 13
      src/storm/utility/storm.h
  29. 7
      src/test/parser/MappedFileTest.cpp

23
src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
View File

@ -1,5 +1,6 @@
#include "DFTASFChecker.h" #include "DFTASFChecker.h"
#include <string> #include <string>
#include "storm/utility/file.h"
namespace storm { namespace storm {
@ -394,24 +395,22 @@ namespace storm {
} }
void DFTASFChecker::toFile(std::string const& filename) { void DFTASFChecker::toFile(std::string const& filename) {
std::ofstream ofs; std::ofstream stream;
std::cout << "Writing to " << filename << std::endl; storm::utility::openFile(filename, stream);
ofs.open(filename); stream << "; time point variables" << std::endl;
ofs << "; time point variables" << std::endl;
for (auto const& timeVarEntry : timePointVariables) { for (auto const& timeVarEntry : timePointVariables) {
ofs << "(declare-fun " << varNames[timeVarEntry.second] << "() Int)" << std::endl; stream << "(declare-fun " << varNames[timeVarEntry.second] << "() Int)" << std::endl;
} }
ofs << "; claim variables" << std::endl; stream << "; claim variables" << std::endl;
for (auto const& claimVarEntry : claimVariables) { for (auto const& claimVarEntry : claimVariables) {
ofs << "(declare-fun " << varNames[claimVarEntry.second] << "() Int)" << std::endl; stream << "(declare-fun " << varNames[claimVarEntry.second] << "() Int)" << std::endl;
} }
for (auto const& constraint : constraints) { for (auto const& constraint : constraints) {
ofs << "; " << constraint->description() << std::endl; stream << "; " << constraint->description() << std::endl;
ofs << "(assert " << constraint->toSmtlib2(varNames) << ")" << std::endl; stream << "(assert " << constraint->toSmtlib2(varNames) << ")" << std::endl;
} }
ofs << "(check-sat)" << std::endl; stream << "(check-sat)" << std::endl;
ofs.close(); storm::utility::closeFile(stream);
} }
} }
} }

17
src/storm-dft/parser/DFTGalileoParser.cpp
View File

@ -10,6 +10,7 @@
#include "storm/exceptions/FileIoException.h" #include "storm/exceptions/FileIoException.h"
#include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/NotSupportedException.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -49,18 +50,10 @@ namespace storm {
std::string parametricToken = "param"; std::string parametricToken = "param";
std::ifstream file; std::ifstream file;
file.exceptions ( std::ifstream::failbit ); storm::utility::openFile(filename, file);
try {
file.open(filename);
}
catch (std::ifstream::failure e) {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Exception during file opening on " << filename << ".");
return;
}
file.exceptions( std::ifstream::goodbit );
std::string line; std::string line;
while(std::getline(file, line)) { while (std::getline(file, line)) {
bool success = true; bool success = true;
STORM_LOG_TRACE("Parsing: " << line); STORM_LOG_TRACE("Parsing: " << line);
size_t commentstarts = line.find("//"); size_t commentstarts = line.find("//");
@ -143,7 +136,7 @@ namespace storm {
if(!builder.setTopLevel(toplevelId)) { if(!builder.setTopLevel(toplevelId)) {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Top level id unknown."); STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Top level id unknown.");
} }
file.close(); storm::utility::closeFile(file);
} }
template<typename ValueType> template<typename ValueType>

14
src/storm-dft/parser/DFTJsonParser.cpp
View File

@ -10,6 +10,7 @@
#include "storm/exceptions/FileIoException.h" #include "storm/exceptions/FileIoException.h"
#include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/NotSupportedException.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -52,19 +53,10 @@ namespace storm {
STORM_LOG_DEBUG("Parsing from JSON"); STORM_LOG_DEBUG("Parsing from JSON");
std::ifstream file; std::ifstream file;
file.exceptions ( std::ifstream::failbit ); storm::utility::openFile(filename, file);
try {
file.open(filename);
}
catch (std::ifstream::failure e) {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Exception during file opening on " << filename << ".");
return;
}
file.exceptions( std::ifstream::goodbit );
json parsedJson; json parsedJson;
parsedJson << file; parsedJson << file;
file.close(); storm::utility::closeFile(file);
// Start by building mapping from ids to names // Start by building mapping from ids to names
std::map<std::string, std::string> nameMapping; std::map<std::string, std::string> nameMapping;

8
src/storm-gspn-cli/storm-gspn.cpp
View File

@ -56,19 +56,19 @@ void initializeSettings() {
std::unordered_map<std::string, uint64_t> parseCapacitiesList(std::string const& filename) { std::unordered_map<std::string, uint64_t> parseCapacitiesList(std::string const& filename) {
std::unordered_map<std::string, uint64_t> map; std::unordered_map<std::string, uint64_t> map;
std::ifstream ifs; std::ifstream stream;
ifs.open(filename); storm::utility::openFile(filename, stream);
std::string line; std::string line;
while( std::getline(ifs, line) ) { while ( std::getline(stream, line) ) {
std::vector<std::string> strs; std::vector<std::string> strs;
boost::split(strs, line, boost::is_any_of("\t ")); boost::split(strs, line, boost::is_any_of("\t "));
STORM_LOG_THROW(strs.size() == 2, storm::exceptions::WrongFormatException, "Expect key value pairs"); STORM_LOG_THROW(strs.size() == 2, storm::exceptions::WrongFormatException, "Expect key value pairs");
std::cout << std::stoll(strs[1]) << std::endl; std::cout << std::stoll(strs[1]) << std::endl;
map[strs[0]] = std::stoll(strs[1]); map[strs[0]] = std::stoll(strs[1]);
} }
storm::utility::closeFile(stream);
return map; return map;
} }

20
src/storm-gspn/storm-gspn.h
View File

@ -8,6 +8,8 @@
#include "storm/settings/SettingsManager.h" #include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/GSPNExportSettings.h" #include "storm/settings/modules/GSPNExportSettings.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
/** /**
* Builds JANI model from GSPN. * Builds JANI model from GSPN.
@ -21,23 +23,23 @@ namespace storm {
storm::settings::modules::GSPNExportSettings const& exportSettings = storm::settings::getModule<storm::settings::modules::GSPNExportSettings>(); storm::settings::modules::GSPNExportSettings const& exportSettings = storm::settings::getModule<storm::settings::modules::GSPNExportSettings>();
if (exportSettings.isWriteToDotSet()) { if (exportSettings.isWriteToDotSet()) {
std::ofstream fs; std::ofstream fs;
fs.open(exportSettings.getWriteToDotFilename()); storm::utility::openFile(exportSettings.getWriteToDotFilename(), fs);
gspn.writeDotToStream(fs); gspn.writeDotToStream(fs);
fs.close(); storm::utility::closeFile(fs);
} }
if (exportSettings.isWriteToPnproSet()) { if (exportSettings.isWriteToPnproSet()) {
std::ofstream fs; std::ofstream fs;
fs.open(exportSettings.getWriteToPnproFilename()); storm::utility::openFile(exportSettings.getWriteToPnproFilename(), fs);
gspn.toPnpro(fs); gspn.toPnpro(fs);
fs.close(); storm::utility::closeFile(fs);
} }
if (exportSettings.isWriteToPnmlSet()) { if (exportSettings.isWriteToPnmlSet()) {
std::ofstream fs; std::ofstream fs;
fs.open(exportSettings.getWriteToPnmlFilename()); storm::utility::openFile(exportSettings.getWriteToPnmlFilename(), fs);
gspn.toPnml(fs); gspn.toPnml(fs);
fs.close(); storm::utility::closeFile(fs);
} }
if (exportSettings.isDisplayStatsSet()) { if (exportSettings.isDisplayStatsSet()) {
@ -48,13 +50,13 @@ namespace storm {
if (exportSettings.isWriteStatsToFileSet()) { if (exportSettings.isWriteStatsToFileSet()) {
std::ofstream fs; std::ofstream fs;
fs.open(exportSettings.getWriteStatsFilename()); storm::utility::openFile(exportSettings.getWriteStatsFilename(), fs);
gspn.writeStatsToStream(fs); gspn.writeStatsToStream(fs);
fs.close(); storm::utility::closeFile(fs);
} }
} }
} }

11
src/storm-pgcl-cli/storm-pgcl.cpp
View File

@ -47,13 +47,10 @@ void handleJani(storm::jani::Model& model) {
void programGraphToDotFile(storm::ppg::ProgramGraph const& prog) { void programGraphToDotFile(storm::ppg::ProgramGraph const& prog) {
std::string filepath = storm::settings::getModule<storm::settings::modules::PGCLSettings>().getProgramGraphDotOutputFilename(); std::string filepath = storm::settings::getModule<storm::settings::modules::PGCLSettings>().getProgramGraphDotOutputFilename();
std::ofstream ofs; std::ofstream stream;
ofs.open(filepath, std::ofstream::out ); storm::utility::openFile(filepath, stream);
if (ofs.is_open()) { prog.printDot(stream);
prog.printDot(ofs); storm::utility::closeFile(stream);
} else {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Cannot open " << filepath);
}
} }
int main(const int argc, const char** argv) { int main(const int argc, const char** argv) {

9
src/storm-pgcl/parser/PgclParser.cpp
View File

@ -1,6 +1,7 @@
#include "PgclParser.h" #include "PgclParser.h"
// If the parser fails due to ill-formed data, this exception is thrown. // If the parser fails due to ill-formed data, this exception is thrown.
#include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/WrongFormatException.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -9,8 +10,8 @@ namespace storm {
storm::pgcl::PgclProgram result; storm::pgcl::PgclProgram result;
// Open file and initialize result. // Open file and initialize result.
std::ifstream inputFileStream(filename, std::ios::in); std::ifstream inputFileStream;
STORM_LOG_THROW(inputFileStream.good(), storm::exceptions::WrongFormatException, "Unable to read from file '" << filename << "'."); storm::utility::openFile(filename, inputFileStream);
// Now try to parse the contents of the file. // Now try to parse the contents of the file.
try { try {
@ -18,12 +19,12 @@ namespace storm {
result = parseFromString(fileContent, filename); result = parseFromString(fileContent, filename);
} catch(std::exception& e) { } catch(std::exception& e) {
// In case of an exception properly close the file before passing exception. // In case of an exception properly close the file before passing exception.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
throw e; throw e;
} }
// Close the stream in case everything went smoothly and return result. // Close the stream in case everything went smoothly and return result.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
return result; return result;
} }

5
src/storm/abstraction/MenuGameAbstractor.cpp
View File

@ -7,6 +7,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/utility/dd.h" #include "storm/utility/dd.h"
#include "storm/utility/file.h"
#include "storm-config.h" #include "storm-config.h"
#include "storm/adapters/CarlAdapter.h" #include "storm/adapters/CarlAdapter.h"
@ -47,7 +48,8 @@ namespace storm {
template <storm::dd::DdType DdType, typename ValueType> template <storm::dd::DdType DdType, typename ValueType>
void MenuGameAbstractor<DdType, ValueType>::exportToDot(storm::abstraction::MenuGame<DdType, ValueType> const& currentGame, std::string const& filename, storm::dd::Bdd<DdType> const& highlightStatesBdd, storm::dd::Bdd<DdType> const& filter) const { void MenuGameAbstractor<DdType, ValueType>::exportToDot(storm::abstraction::MenuGame<DdType, ValueType> const& currentGame, std::string const& filename, storm::dd::Bdd<DdType> const& highlightStatesBdd, storm::dd::Bdd<DdType> const& filter) const {
std::ofstream out(filename); std::ofstream out;
storm::utility::openFile(filename, out);
AbstractionInformation<DdType> const& abstractionInformation = this->getAbstractionInformation(); AbstractionInformation<DdType> const& abstractionInformation = this->getAbstractionInformation();
storm::dd::Add<DdType, ValueType> filteredTransitions = filter.template toAdd<ValueType>() * currentGame.getTransitionMatrix(); storm::dd::Add<DdType, ValueType> filteredTransitions = filter.template toAdd<ValueType>() * currentGame.getTransitionMatrix();
@ -130,6 +132,7 @@ namespace storm {
} }
out << "}" << std::endl; out << "}" << std::endl;
storm::utility::closeFile(out);
} }
template class MenuGameAbstractor<storm::dd::DdType::CUDD, double>; template class MenuGameAbstractor<storm::dd::DdType::CUDD, double>;

8
src/storm/cli/entrypoints.h
View File

@ -324,10 +324,10 @@ namespace storm {
// And export if required. // And export if required.
if(storm::settings::getModule<storm::settings::modules::IOSettings>().isExportExplicitSet()) { if(storm::settings::getModule<storm::settings::modules::IOSettings>().isExportExplicitSet()) {
std::ofstream ofs; std::ofstream stream;
ofs.open(storm::settings::getModule<storm::settings::modules::IOSettings>().getExportExplicitFilename(), std::ofstream::out); storm::utility::openFile(storm::settings::getModule<storm::settings::modules::IOSettings>().getExportExplicitFilename(), stream);
storm::exporter::explicitExportSparseModel(ofs, sparseModel, model.getParameterNames()); storm::exporter::explicitExportSparseModel(stream, sparseModel, model.getParameterNames());
ofs.close(); storm::utility::closeFile(stream);
} }
} }

5
src/storm/modelchecker/region/ParameterRegion.cpp
View File

@ -7,7 +7,8 @@
#include "storm/settings/modules/RegionSettings.h" #include "storm/settings/modules/RegionSettings.h"
#include "storm/exceptions/InvalidSettingsException.h" #include "storm/exceptions/InvalidSettingsException.h"
#include "storm/exceptions/InvalidArgumentException.h" #include "storm/exceptions/InvalidArgumentException.h"
#include "utility/constants.h" #include "storm/utility/constants.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace modelchecker { namespace modelchecker {
@ -283,7 +284,7 @@ namespace storm {
} }
else{ else{
//if we reach this point we can assume that the region is given as a file. //if we reach this point we can assume that the region is given as a file.
STORM_LOG_THROW(storm::parser::MappedFile::fileExistsAndIsReadable(storm::settings::getModule<storm::settings::modules::RegionSettings>().getRegionFilePath().c_str()), storm::exceptions::InvalidSettingsException, "The path to the file in which the regions are specified is not valid."); STORM_LOG_THROW(storm::utility::fileExistsAndIsReadable(storm::settings::getModule<storm::settings::modules::RegionSettings>().getRegionFilePath()), storm::exceptions::InvalidSettingsException, "The path to the file in which the regions are specified is not valid.");
storm::parser::MappedFile mf(storm::settings::getModule<storm::settings::modules::RegionSettings>().getRegionFilePath().c_str()); storm::parser::MappedFile mf(storm::settings::getModule<storm::settings::modules::RegionSettings>().getRegionFilePath().c_str());
regionsString = std::string(mf.getData(),mf.getDataSize()); regionsString = std::string(mf.getData(),mf.getDataSize());
} }

5
src/storm/parser/AtomicPropositionLabelingParser.cpp
View File

@ -24,11 +24,6 @@ namespace storm {
storm::models::sparse::StateLabeling AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(uint_fast64_t stateCount, std::string const & filename) { storm::models::sparse::StateLabeling AtomicPropositionLabelingParser::parseAtomicPropositionLabeling(uint_fast64_t stateCount, std::string const & filename) {
// Open the given file. // Open the given file.
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": The supplied Labeling input file does not exist or is not readable by this process.");
throw storm::exceptions::FileIoException() << "Error while parsing " << filename << ": The supplied Labeling input file does not exist or is not readable by this process.";
}
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

5
src/storm/parser/DeterministicSparseTransitionParser.cpp
View File

@ -41,11 +41,6 @@ namespace storm {
// Enforce locale where decimal point is '.'. // Enforce locale where decimal point is '.'.
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": File does not exist or is not readable.");
throw storm::exceptions::FileIoException() << "The supplied Transition input file \"" << filename << "\" does not exist or is not readable by this process.";
}
// Open file. // Open file.
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

9
src/storm/parser/FormulaParser.cpp
View File

@ -15,6 +15,7 @@
#include "storm/storage/expressions/ExpressionEvaluator.h" #include "storm/storage/expressions/ExpressionEvaluator.h"
#include "FormulaParserGrammar.h" #include "FormulaParserGrammar.h"
#include "storm/storage/expressions/ExpressionManager.h" #include "storm/storage/expressions/ExpressionManager.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -65,8 +66,8 @@ namespace storm {
std::vector<storm::jani::Property> FormulaParser::parseFromFile(std::string const& filename) const { std::vector<storm::jani::Property> FormulaParser::parseFromFile(std::string const& filename) const {
// Open file and initialize result. // Open file and initialize result.
std::ifstream inputFileStream(filename, std::ios::in); std::ifstream inputFileStream;
STORM_LOG_THROW(inputFileStream.good(), storm::exceptions::WrongFormatException, "Unable to read from file '" << filename << "'."); storm::utility::openFile(filename, inputFileStream);
std::vector<storm::jani::Property> properties; std::vector<storm::jani::Property> properties;
@ -76,12 +77,12 @@ namespace storm {
properties = parseFromString(fileContent); properties = parseFromString(fileContent);
} catch(std::exception& e) { } catch(std::exception& e) {
// In case of an exception properly close the file before passing exception. // In case of an exception properly close the file before passing exception.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
throw e; throw e;
} }
// Close the stream in case everything went smoothly and return result. // Close the stream in case everything went smoothly and return result.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
return properties; return properties;
} }

14
src/storm/parser/JaniParser.cpp
View File

@ -18,6 +18,7 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -64,18 +65,9 @@ namespace storm {
void JaniParser::readFile(std::string const &path) { void JaniParser::readFile(std::string const &path) {
std::ifstream file; std::ifstream file;
file.exceptions ( std::ifstream::failbit ); storm::utility::openFile(path, file);
try {
file.open(path);
}
catch (std::ifstream::failure e) {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Exception during file opening on " << path << ".");
return;
}
file.exceptions( std::ifstream::goodbit );
parsedStructure << file; parsedStructure << file;
file.close(); storm::utility::closeFile(file);
} }
std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> JaniParser::parseModel(bool parseProperties) { std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> JaniParser::parseModel(bool parseProperties) {

18
src/storm/parser/MappedFile.cpp
View File

@ -15,10 +15,14 @@
#include "storm/exceptions/FileIoException.h" #include "storm/exceptions/FileIoException.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
MappedFile::MappedFile(const char* filename) { MappedFile::MappedFile(const char* filename) {
STORM_LOG_THROW(storm::utility::fileExistsAndIsReadable(filename), storm::exceptions::FileIoException, "Error while reading " << filename << ": The file does not exist or is not readable.");
#if defined LINUX || defined MACOSX #if defined LINUX || defined MACOSX
// Do file mapping for reasonable systems. // Do file mapping for reasonable systems.
@ -29,15 +33,11 @@ namespace storm {
#else #else
if (stat64(filename, &(this->st)) != 0) { if (stat64(filename, &(this->st)) != 0) {
#endif #endif
STORM_LOG_ERROR("Error in stat(" << filename << "): Probably, this file does not exist."); STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Error in stat(" << filename << "): Probably, this file does not exist.");
throw exceptions::FileIoException() << "MappedFile Error in stat(): Probably, this file does not exist.";
} }
this->file = open(filename, O_RDONLY); this->file = open(filename, O_RDONLY);
if (this->file < 0) { STORM_LOG_THROW(this->file >= 0, storm::exceptions::FileIoException, "Error in open(" << filename << "): Probably, we may not read this file.");
STORM_LOG_ERROR("Error in open(" << filename << "): Probably, we may not read this file.");
throw exceptions::FileIoException() << "MappedFile Error in open(): Probably, we may not read this file.";
}
this->data = static_cast<char*>(mmap(NULL, this->st.st_size, PROT_READ, MAP_PRIVATE, this->file, 0)); this->data = static_cast<char*>(mmap(NULL, this->st.st_size, PROT_READ, MAP_PRIVATE, this->file, 0));
if (this->data == MAP_FAILED) { if (this->data == MAP_FAILED) {
@ -90,12 +90,6 @@ namespace storm {
#endif #endif
} }
bool MappedFile::fileExistsAndIsReadable(const char* filename) {
// Test by opening an input file stream and testing the stream flags.
std::ifstream fin(filename);
return fin.good();
}
char const* MappedFile::getData() const { char const* MappedFile::getData() const {
return data; return data;
} }

8
src/storm/parser/MappedFile.h
View File

@ -49,14 +49,6 @@ namespace storm {
*/ */
~MappedFile(); ~MappedFile();
/*!
* Tests whether the given file exists and is readable.
*qi
* @param filename Path and name of the file to be tested.
* @return True iff the file exists and is readable.
*/
static bool fileExistsAndIsReadable(const char* filename);
/*! /*!
* Returns a pointer to the beginning of the mapped file data. * Returns a pointer to the beginning of the mapped file data.
* *

5
src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp
View File

@ -294,11 +294,6 @@ namespace storm {
// Set the locale to correctly recognize floating point numbers. // Set the locale to correctly recognize floating point numbers.
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": File does not exist or is not readable.");
throw storm::exceptions::FileIoException() << "Error while parsing " << filename << ": File does not exist or is not readable.";
}
// Open file and prepare pointer to buffer. // Open file and prepare pointer to buffer.
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

5
src/storm/parser/NondeterministicSparseTransitionParser.cpp
View File

@ -39,11 +39,6 @@ namespace storm {
// Enforce locale where decimal point is '.'. // Enforce locale where decimal point is '.'.
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": File does not exist or is not readable.");
throw storm::exceptions::FileIoException() << "Error while parsing " << filename << ": File does not exist or is not readable.";
}
// Open file. // Open file.
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

10
src/storm/parser/PrismParser.cpp
View File

@ -7,6 +7,7 @@
#include "storm/exceptions/InvalidArgumentException.h" #include "storm/exceptions/InvalidArgumentException.h"
#include "storm/exceptions/InvalidTypeException.h" #include "storm/exceptions/InvalidTypeException.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
#include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/WrongFormatException.h"
#include "storm/storage/expressions/ExpressionManager.h" #include "storm/storage/expressions/ExpressionManager.h"
@ -17,9 +18,8 @@ namespace storm {
namespace parser { namespace parser {
storm::prism::Program PrismParser::parse(std::string const& filename) { storm::prism::Program PrismParser::parse(std::string const& filename) {
// Open file and initialize result. // Open file and initialize result.
std::ifstream inputFileStream(filename); std::ifstream inputFileStream;
STORM_LOG_THROW(inputFileStream.good(), storm::exceptions::WrongFormatException, "Unable to read from file '" << filename << "'."); storm::utility::openFile(filename, inputFileStream);
storm::prism::Program result; storm::prism::Program result;
// Now try to parse the contents of the file. // Now try to parse the contents of the file.
@ -28,12 +28,12 @@ namespace storm {
result = parseFromString(fileContent, filename); result = parseFromString(fileContent, filename);
} catch(std::exception& e) { } catch(std::exception& e) {
// In case of an exception properly close the file before passing exception. // In case of an exception properly close the file before passing exception.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
throw e; throw e;
} }
// Close the stream in case everything went smoothly and return result. // Close the stream in case everything went smoothly and return result.
inputFileStream.close(); storm::utility::closeFile(inputFileStream);
return result; return result;
} }

5
src/storm/parser/SparseChoiceLabelingParser.cpp
View File

@ -13,11 +13,6 @@ namespace storm {
std::vector<storm::models::sparse::LabelSet> SparseChoiceLabelingParser::parseChoiceLabeling(std::vector<uint_fast64_t> const& nondeterministicChoiceIndices, std::string const& filename) { std::vector<storm::models::sparse::LabelSet> SparseChoiceLabelingParser::parseChoiceLabeling(std::vector<uint_fast64_t> const& nondeterministicChoiceIndices, std::string const& filename) {
// Open file. // Open file.
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": File does not exist or is not readable.");
throw storm::exceptions::FileIoException() << "Error while parsing " << filename << ": File does not exist or is not readable.";
}
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

5
src/storm/parser/SparseStateRewardParser.cpp
View File

@ -17,11 +17,6 @@ namespace storm {
template<typename ValueType> template<typename ValueType>
std::vector<ValueType> SparseStateRewardParser<ValueType>::parseSparseStateReward(uint_fast64_t stateCount, std::string const& filename) { std::vector<ValueType> SparseStateRewardParser<ValueType>::parseSparseStateReward(uint_fast64_t stateCount, std::string const& filename) {
// Open file. // Open file.
if (!MappedFile::fileExistsAndIsReadable(filename.c_str())) {
STORM_LOG_ERROR("Error while parsing " << filename << ": File does not exist or is not readable.");
throw storm::exceptions::FileIoException() << "Error while parsing " << filename << ": File does not exist or is not readable.";
}
MappedFile file(filename.c_str()); MappedFile file(filename.c_str());
char const* buf = file.getData(); char const* buf = file.getData();

8
src/storm/settings/SettingsManager.cpp
View File

@ -39,6 +39,7 @@
#include "storm/settings/modules/JitBuilderSettings.h" #include "storm/settings/modules/JitBuilderSettings.h"
#include "storm/settings/modules/MultiObjectiveSettings.h" #include "storm/settings/modules/MultiObjectiveSettings.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
#include "storm/settings/Option.h" #include "storm/settings/Option.h"
namespace storm { namespace storm {
@ -394,8 +395,8 @@ namespace storm {
std::map<std::string, std::vector<std::string>> SettingsManager::parseConfigFile(std::string const& filename) const { std::map<std::string, std::vector<std::string>> SettingsManager::parseConfigFile(std::string const& filename) const {
std::map<std::string, std::vector<std::string>> result; std::map<std::string, std::vector<std::string>> result;
std::ifstream input(filename); std::ifstream input;
STORM_LOG_THROW(input.good(), storm::exceptions::OptionParserException, "Could not read from config file '" << filename << "'."); storm::utility::openFile(filename, input);
bool globalScope = true; bool globalScope = true;
std::string activeModule = ""; std::string activeModule = "";
@ -480,7 +481,8 @@ namespace storm {
} }
} }
} }
storm::utility::closeFile(input);
return result; return result;
} }

13
src/storm/solver/SmtlibSmtSolver.cpp
View File

@ -16,9 +16,10 @@
#include "storm/exceptions/InvalidStateException.h" #include "storm/exceptions/InvalidStateException.h"
#include "storm/exceptions/IllegalArgumentException.h" #include "storm/exceptions/IllegalArgumentException.h"
#include "storm/exceptions/IllegalFunctionCallException.h" #include "storm/exceptions/IllegalFunctionCallException.h"
#include "utility/macros.h" #include "storm/utility/macros.h"
#include "adapters/CarlAdapter.h" #include "storm/utility/file.h"
#include "exceptions/UnexpectedException.h" #include "storm/adapters/CarlAdapter.h"
#include "storm/exceptions/UnexpectedException.h"
namespace storm { namespace storm {
namespace solver { namespace solver {
@ -245,9 +246,9 @@ namespace storm {
if (storm::settings::getModule<storm::settings::modules::Smt2SmtSolverSettings>().isExportSmtLibScriptSet()){ if (storm::settings::getModule<storm::settings::modules::Smt2SmtSolverSettings>().isExportSmtLibScriptSet()){
STORM_LOG_DEBUG("The SMT-LIBv2 commands are exportet to the given file"); STORM_LOG_DEBUG("The SMT-LIBv2 commands are exportet to the given file");
commandFile.open(storm::settings::getModule<storm::settings::modules::Smt2SmtSolverSettings>().getExportSmtLibScriptPath(), std::ios::trunc); storm::utility::openFile(storm::settings::getModule<storm::settings::modules::Smt2SmtSolverSettings>().getExportSmtLibScriptPath(), commandFile);
isCommandFileOpen=commandFile.is_open(); isCommandFileOpen = true;
STORM_LOG_THROW(isCommandFileOpen, storm::exceptions::InvalidArgumentException, "The file where the smt2commands should be written to could not be opened"); // TODO also close file
} }
//some initial commands //some initial commands

6
src/storm/storage/dd/Odd.cpp
View File

@ -6,6 +6,7 @@
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/exceptions/InvalidArgumentException.h" #include "storm/exceptions/InvalidArgumentException.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
namespace dd { namespace dd {
@ -86,7 +87,7 @@ namespace storm {
void Odd::exportToDot(std::string const& filename) const { void Odd::exportToDot(std::string const& filename) const {
std::ofstream dotFile; std::ofstream dotFile;
dotFile.open (filename); storm::utility::openFile(filename, dotFile);
// Print header. // Print header.
dotFile << "digraph \"ODD\" {" << std::endl << "center=true;" << std::endl << "edge [dir = none];" << std::endl; dotFile << "digraph \"ODD\" {" << std::endl << "center=true;" << std::endl << "edge [dir = none];" << std::endl;
@ -129,8 +130,7 @@ namespace storm {
} }
dotFile << "}" << std::endl; dotFile << "}" << std::endl;
storm::utility::closeFile(dotFile);
dotFile.close();
} }
void Odd::addToLevelToOddNodesMap(std::map<uint_fast64_t, std::vector<std::reference_wrapper<storm::dd::Odd const>>>& levelToOddNodesMap, uint_fast64_t level) const { void Odd::addToLevelToOddNodesMap(std::map<uint_fast64_t, std::vector<std::reference_wrapper<storm::dd::Odd const>>>& levelToOddNodesMap, uint_fast64_t level) const {

18
src/storm/storage/jani/JSONExporter.cpp
View File

@ -5,6 +5,7 @@
#include <vector> #include <vector>
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/utility/file.h"
#include "storm/exceptions/FileIoException.h" #include "storm/exceptions/FileIoException.h"
#include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/NotSupportedException.h"
@ -510,20 +511,11 @@ namespace storm {
return modernjson::json(expression.getValueAsDouble()); return modernjson::json(expression.getValueAsDouble());
} }
void JsonExporter::toFile(storm::jani::Model const& janiModel, std::vector<storm::jani::Property> const& formulas, std::string const& filepath, bool checkValid) { void JsonExporter::toFile(storm::jani::Model const& janiModel, std::vector<storm::jani::Property> const& formulas, std::string const& filepath, bool checkValid) {
std::ofstream ofs; std::ofstream stream;
ofs.open (filepath, std::ofstream::out ); storm::utility::openFile(filepath, stream);
if(ofs.is_open()) { toStream(janiModel, formulas, stream, checkValid);
toStream(janiModel, formulas, ofs, checkValid); storm::utility::closeFile(stream);
} else {
STORM_LOG_THROW(false, storm::exceptions::FileIoException, "Cannot open " << filepath);
}
} }
void JsonExporter::toStream(storm::jani::Model const& janiModel, std::vector<storm::jani::Property> const& formulas, std::ostream& os, bool checkValid) { void JsonExporter::toStream(storm::jani::Model const& janiModel, std::vector<storm::jani::Property> const& formulas, std::ostream& os, bool checkValid) {

15
src/storm/utility/export.h
View File

@ -12,7 +12,7 @@
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/exceptions/FileIoException.h" #include "storm/utility/file.h"
//#include "storm/storage/parameters.h" //#include "storm/storage/parameters.h"
//#include "storm/settings/modules/ParametricSettings.h" //#include "storm/settings/modules/ParametricSettings.h"
@ -40,19 +40,11 @@ namespace storm {
filestream.close(); filestream.close();
} }
*/ */
inline void exportStringToFile(std::string const& str, std::string filepath) {
std::ofstream filestream;
filestream.open(filepath);
STORM_LOG_THROW(filestream.is_open(), storm::exceptions::FileIoException , "Could not open file " << filepath << ".");
filestream << str;
}
template <typename ValueType> template <typename ValueType>
inline void exportDataToCSVFile(std::string filepath, std::vector<std::vector<ValueType>> const& data, boost::optional<std::vector<std::string>> const& columnHeaders) { inline void exportDataToCSVFile(std::string filepath, std::vector<std::vector<ValueType>> const& data, boost::optional<std::vector<std::string>> const& columnHeaders) {
std::ofstream filestream; std::ofstream filestream;
filestream.open(filepath); storm::utility::openFile(filepath, filestream);
STORM_LOG_THROW(filestream.is_open(), storm::exceptions::FileIoException , "Could not open file " << filepath << ".");
if(columnHeaders) { if(columnHeaders) {
for(auto columnIt = columnHeaders->begin(); columnIt != columnHeaders->end(); ++columnIt) { for(auto columnIt = columnHeaders->begin(); columnIt != columnHeaders->end(); ++columnIt) {
@ -73,10 +65,9 @@ namespace storm {
} }
filestream << std::endl; filestream << std::endl;
} }
storm::utility::closeFile(filestream);
} }
} }
} }
#endif #endif

81
src/storm/utility/file.h
View File

@ -0,0 +1,81 @@
/**
* @file: file.h
* @author: Sebastian Junges
*
* @since October 7, 2014
*/
#ifndef STORM_UTILITY_FILE_H_
#define STORM_UTILITY_FILE_H_
#include <iostream>
#include "storm/utility/macros.h"
#include "storm/exceptions/FileIoException.h"
namespace storm {
namespace utility {
/*!
* Open the given file for writing.
*
* @param filename Path and name of the file to be tested.
* @param filestream Contains the file handler afterwards.
* @param append If true, the new content is appended instead of clearing the existing content.
*/
inline void openFile(std::string const& filepath, std::ofstream& filestream, bool append = false) {
if (append) {
filestream.open(filepath, std::ios::app);
} else {
filestream.open(filepath);
}
STORM_LOG_THROW(filestream, storm::exceptions::FileIoException , "Could not open file " << filepath << ".");
STORM_PRINT_AND_LOG("Write to file " << filepath << "." << std::endl);
}
/*!
* Open the given file for reading.
*
* @param filename Path and name of the file to be tested.
* @param filestream Contains the file handler afterwards.
*/
inline void openFile(std::string const& filepath, std::ifstream& filestream) {
filestream.open(filepath);
STORM_LOG_THROW(filestream, storm::exceptions::FileIoException , "Could not open file " << filepath << ".");
}
/*!
* Close the given file after writing.
*
* @param filestream Contains the file handler to close.
*/
inline void closeFile(std::ofstream& stream) {
stream.close();
}
/*!
* Close the given file after reading.
*
* @param filestream Contains the file handler to close.
*/
inline void closeFile(std::ifstream& stream) {
stream.close();
}
/*!
* Tests whether the given file exists and is readable.
*
* @param filename Path and name of the file to be tested.
* @return True iff the file exists and is readable.
*/
inline bool fileExistsAndIsReadable(std::string const& filename) {
// Test by opening an input file stream and testing the stream flags.
std::ifstream filestream;
filestream.open(filename);
return filestream.good();
}
}
}
#endif

13
src/storm/utility/storm.h
View File

@ -97,6 +97,7 @@
#include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/NotSupportedException.h"
#include "storm/utility/Stopwatch.h" #include "storm/utility/Stopwatch.h"
#include "storm/utility/file.h"
namespace storm { namespace storm {
@ -434,7 +435,7 @@ namespace storm {
inline void exportParametricResultToFile(storm::RationalFunction const& result, storm::models::sparse::Dtmc<storm::RationalFunction>::ConstraintCollector const& constraintCollector, std::string const& path) { inline void exportParametricResultToFile(storm::RationalFunction const& result, storm::models::sparse::Dtmc<storm::RationalFunction>::ConstraintCollector const& constraintCollector, std::string const& path) {
std::ofstream filestream; std::ofstream filestream;
filestream.open(path); storm::utility::openFile(path, filestream);
// TODO: add checks. // TODO: add checks.
filestream << "!Parameters: "; filestream << "!Parameters: ";
std::set<storm::RationalFunctionVariable> vars = result.gatherVariables(); std::set<storm::RationalFunctionVariable> vars = result.gatherVariables();
@ -445,7 +446,7 @@ namespace storm {
std::copy(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n")); std::copy(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n"));
filestream << "!Graph-preserving Constraints: " << std::endl; filestream << "!Graph-preserving Constraints: " << std::endl;
std::copy(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n")); std::copy(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n"));
filestream.close(); storm::utility::closeFile(filestream);
} }
template<> template<>
@ -623,10 +624,10 @@ namespace storm {
template<typename ValueType> template<typename ValueType>
void exportMatrixToFile(std::shared_ptr<storm::models::sparse::Model<ValueType>> model, std::string const& filepath) { void exportMatrixToFile(std::shared_ptr<storm::models::sparse::Model<ValueType>> model, std::string const& filepath) {
STORM_LOG_THROW(model->getType() != storm::models::ModelType::Ctmc, storm::exceptions::NotImplementedException, "This functionality is not yet implemented." ); STORM_LOG_THROW(model->getType() != storm::models::ModelType::Ctmc, storm::exceptions::NotImplementedException, "This functionality is not yet implemented." );
std::ofstream ofs; std::ofstream stream;
ofs.open (filepath, std::ofstream::out); storm::utility::openFile(filepath, stream);
model->getTransitionMatrix().printAsMatlabMatrix(ofs); model->getTransitionMatrix().printAsMatlabMatrix(stream);
ofs.close(); storm::utility::closeFile(stream);
} }
} }

7
src/test/parser/MappedFileTest.cpp
View File

@ -11,6 +11,7 @@
#include <string> #include <string>
#include "storm/parser/MappedFile.h" #include "storm/parser/MappedFile.h"
#include "storm/utility/cstring.h" #include "storm/utility/cstring.h"
#include "storm/utility/file.h"
#include "storm/exceptions/FileIoException.h" #include "storm/exceptions/FileIoException.h"
TEST(MappedFileTest, NonExistingFile) { TEST(MappedFileTest, NonExistingFile) {
@ -41,12 +42,12 @@ TEST(MappedFileTest, ExistsAndReadble) {
// Test the fileExistsAndIsReadable() method under various circumstances. // Test the fileExistsAndIsReadable() method under various circumstances.
// File exists and is readable. // File exists and is readable.
ASSERT_TRUE(storm::parser::MappedFile::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/txt/testStringFile.txt")); ASSERT_TRUE(storm::utility::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/txt/testStringFile.txt"));
// File does not exist. // File does not exist.
ASSERT_FALSE(storm::parser::MappedFile::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/nonExistingFile.not")); ASSERT_FALSE(storm::utility::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/nonExistingFile.not"));
// File exists but is not readable. // File exists but is not readable.
// TODO: Find portable solution to providing a situation in which a file exists but is not readable. // TODO: Find portable solution to providing a situation in which a file exists but is not readable.
//ASSERT_FALSE(storm::parser::MappedFile::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/parser/unreadableFile.txt")); //ASSERT_FALSE(storm::utility::fileExistsAndIsReadable(STORM_TEST_RESOURCES_DIR "/parser/unreadableFile.txt"));
} }
Write Preview
|||||||
100:0
Loading…
Cancel
Save