ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-30 16:13:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed MonteCarlo EOF problem. #459 (#531)

Browse Source 
* Added tests for MonteCarlo varfile eof line problem

* Remove redundant variables in MonteCarlo varfile test

* Fixed MonteCarlo varfile eof line problem. #459
This commit is contained in:
Nick Kapliev 2017-12-13 18:01:31 +00:00 committed by Christopher LaChance
parent da7a79e897
commit c8619dbea7
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trick_source/sim_services/MonteCarlo/MonteVarFile.cpp
View File

@ -45,8 +45,12 @@ std::string Trick::MonteVarFile::get_next_value() {
std::getline(*input_file_stream, line); std::getline(*input_file_stream, line);
if(input_file_stream->eof()) { if(input_file_stream->eof()) {
if (line.empty()) {
input_file_stream->close(); input_file_stream->close();
return "EOF"; return "EOF";
} else {
input_file_stream->seekg(0, input_file_stream->end);
}
} }
} }
while(line[0] == '#' || line[0] == '\0'); while(line[0] == '#' || line[0] == '\0');

1
trick_source/sim_services/MonteCarlo/test/MonteCarlo_eof_line Normal file
View File

@ -0,0 +1 @@
0 1.0000 1.5000

1
trick_source/sim_services/MonteCarlo/test/MonteCarlo_line_ended_eof Normal file
View File

@ -0,0 +1 @@
0 1.0000 1.5000

20
trick_source/sim_services/MonteCarlo/test/MonteCarlo_test.cpp
View File

@ -319,8 +319,6 @@ TEST_F(MonteCarloTest, TestSlaves) {
} }
TEST_F(MonteCarloTest, MonteVarFile) { TEST_F(MonteCarloTest, MonteVarFile) {
std::string buffer;
std::string buffer2;
//req.add_requirement("3932595803"); //req.add_requirement("3932595803");
// Test MonteVarFile // Test MonteVarFile
@ -331,6 +329,24 @@ TEST_F(MonteCarloTest, MonteVarFile) {
EXPECT_EQ(exec.variables.size(), 1) ; EXPECT_EQ(exec.variables.size(), 1) ;
} }
TEST_F(MonteCarloTest, MonteVarFileWithEOFLine) {
Trick::MonteVarFile var0("time_to_fire_1", "MonteCarlo_eof_line", 2) ;
EXPECT_EQ(exec.variables.size(), 0) ;
exec.add_variable(&var0) ;
EXPECT_EQ(var0.get_next_value(), "time_to_fire_1 = 1.0000") ;
EXPECT_EQ(exec.variables.size(), 1) ;
EXPECT_EQ(var0.get_next_value(), "EOF") ;
}
TEST_F(MonteCarloTest, MonteVarFileWithLineEndedEOF) {
Trick::MonteVarFile var0("time_to_fire_1", "MonteCarlo_line_ended_eof", 2) ;
EXPECT_EQ(exec.variables.size(), 0) ;
exec.add_variable(&var0) ;
EXPECT_EQ(var0.get_next_value(), "time_to_fire_1 = 1.0000") ;
EXPECT_EQ(exec.variables.size(), 1) ;
EXPECT_EQ(var0.get_next_value(), "EOF") ;
}
TEST_F(MonteCarloTest, MonteVarRandom_Gaussian) { TEST_F(MonteCarloTest, MonteVarRandom_Gaussian) {
std::string str; std::string str;
double value; double value;