Browse Source

renamed shieldEnding to shieldFiletype

tempestpy_adaptions
Lukas Posch 3 years ago
committed by Stefan Pranger
parent
commit
09f0cc36a3
  1. 6
      src/test/storm/modelchecker/prctl/mdp/ShieldGenerationMdpPrctlModelCheckerTest.cpp
  2. 6
      src/test/storm/modelchecker/rpatl/smg/ShieldGenerationSmgRpatlModelCheckerTest.cpp

6
src/test/storm/modelchecker/prctl/mdp/ShieldGenerationMdpPrctlModelCheckerTest.cpp

@ -57,7 +57,7 @@ namespace {
ValueType parseNumber(std::string const& input) const { return storm::utility::convertNumber<ValueType>(input);} ValueType parseNumber(std::string const& input) const { return storm::utility::convertNumber<ValueType>(input);}
void convertShieldingFileToString(std::string filename, std::string &shieldingString) { void convertShieldingFileToString(std::string filename, std::string &shieldingString) {
filename += shieldEnding;
filename += shieldFiletype;
std::ifstream resultFile(filename); std::ifstream resultFile(filename);
std::stringstream resultBuffer; std::stringstream resultBuffer;
resultBuffer << resultFile.rdbuf(); resultBuffer << resultFile.rdbuf();
@ -68,13 +68,13 @@ namespace {
this->convertShieldingFileToString(filename, shieldingString); this->convertShieldingFileToString(filename, shieldingString);
std::string compareFileName = STORM_TEST_RESOURCES_DIR "/mdp-shields/" + filename; std::string compareFileName = STORM_TEST_RESOURCES_DIR "/mdp-shields/" + filename;
this->convertShieldingFileToString(compareFileName, compareFileString); this->convertShieldingFileToString(compareFileName, compareFileString);
filename += shieldEnding;
filename += shieldFiletype;
std::remove(filename.c_str()); std::remove(filename.c_str());
} }
private: private:
storm::Environment _environment; storm::Environment _environment;
std::string shieldEnding = ".shield";
std::string shieldFiletype = ".shield";
}; };
typedef ::testing::Types< typedef ::testing::Types<

6
src/test/storm/modelchecker/rpatl/smg/ShieldGenerationSmgRpatlModelCheckerTest.cpp

@ -57,7 +57,7 @@ namespace {
ValueType parseNumber(std::string const& input) const { return storm::utility::convertNumber<ValueType>(input);} ValueType parseNumber(std::string const& input) const { return storm::utility::convertNumber<ValueType>(input);}
void convertShieldingFileToString(std::string filename, std::string &shieldingString) { void convertShieldingFileToString(std::string filename, std::string &shieldingString) {
filename += shieldEnding;
filename += shieldFiletype;
std::ifstream resultFile(filename); std::ifstream resultFile(filename);
std::stringstream resultBuffer; std::stringstream resultBuffer;
resultBuffer << resultFile.rdbuf(); resultBuffer << resultFile.rdbuf();
@ -68,14 +68,14 @@ namespace {
this->convertShieldingFileToString(filename, shieldingString); this->convertShieldingFileToString(filename, shieldingString);
std::string compareFileName = STORM_TEST_RESOURCES_DIR "/smg-shields/" + filename; std::string compareFileName = STORM_TEST_RESOURCES_DIR "/smg-shields/" + filename;
this->convertShieldingFileToString(compareFileName, compareFileString); this->convertShieldingFileToString(compareFileName, compareFileString);
filename += shieldEnding;
filename += shieldFiletype;
std::remove(filename.c_str()); std::remove(filename.c_str());
} }
private: private:
storm::Environment _environment; storm::Environment _environment;
std::string shieldEnding = ".shield";
std::string shieldFiletype = ".shield";
}; };
typedef ::testing::Types< typedef ::testing::Types<

Loading…
Cancel
Save