ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-13 14:13:03 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Swapped line read in to std::getline().

Browse Source
This commit is contained in:
Christopher LaChance 2017-10-16 12:56:45 -05:00
parent ebe4174b5c
commit f81d7b0c16
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/trick/MonteVarFile.hh
View File

@ -73,9 +73,6 @@ namespace Trick {
/** The input file stream. */
std::ifstream *input_file_stream; /**< \n trick_units(--) */
/** A character buffer. */
char *buffer; /**< \n trick_units(--) */
public:
/**
* Constructs a MonteVarFile with the specified name, file name, column, and units.

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

@ -15,13 +15,11 @@ Trick::MonteVarFile::MonteVarFile(std::string in_name, std::string in_file_name,
this->unit = in_unit;
set_file_name(in_file_name);
buffer = new char[4096];
}
Trick::MonteVarFile::~MonteVarFile()
{
delete input_file_stream;
delete buffer;
}
// Composite the various properties of this MonteVarFile.
@ -42,10 +40,11 @@ std::string Trick::MonteVarFile::get_next_value()
{
if (input_file_stream->good())
{
std::string line;
// Skip the comments and empty lines in the data file.
do
{
input_file_stream->getline(buffer, 4096);
std::getline(*input_file_stream, line);
if(input_file_stream->eof())
{
@ -53,13 +52,12 @@ std::string Trick::MonteVarFile::get_next_value()
return "EOF";
}
}
while(buffer[0] == '#' || buffer[0] == '\0');
while(line[0] == '#' || line[0] == '\0');
// Count the number of columns in the input file.
char *token;
unsigned int ntokens = 0;
char temp_str[4096];
strcpy(temp_str, buffer);
char* temp_str = strdup(line.c_str());
token = strtok(temp_str, " \t");
while (token != NULL)
{
@ -76,7 +74,7 @@ std::string Trick::MonteVarFile::get_next_value()
}
// Get the next value.
strcpy(temp_str, buffer);
temp_str = strdup(line.c_str());
token = strtok(temp_str, " \t");
for(unsigned int i = 1; i < column; i++)