This commit is contained in:
Andrey 2022-09-24 23:07:55 -04:00
parent a38d87b0e0
commit 782f4f32b8
2 changed files with 4 additions and 3 deletions

View File

@ -21,10 +21,11 @@ CsvReader::~CsvReader() {
}
}
void CsvReader::open(const char *fileName, const int* triggerColumnIndeces) {
void CsvReader::open(const char *fileName, const int* triggerColumnIndeces, const int *vvtColumnIndeces) {
printf("Reading from %s\r\n", fileName);
fp = fopen(fileName, "r");
this->triggerColumnIndeces = triggerColumnIndeces;
this->vvtColumnIndeces = vvtColumnIndeces;
ASSERT_TRUE(fp != nullptr);
}
@ -70,7 +71,7 @@ void CsvReader::processLine(EngineTestHelper *eth) {
for (size_t i = 0;i<m_vvtCount;i++) {
char *vvtToken = trim(strtok(nullptr, s));
newVvtState[i] = vvtToken[0] == '1';
newVvtState[vvtColumnIndeces[i]] = vvtToken[0] == '1';
}
if (timeStampstr == nullptr) {

View File

@ -20,7 +20,7 @@ public:
}
~CsvReader();
void open(const char *fileName, const int* triggerColumnIndeces = NORMAL_ORDER);
void open(const char *fileName, const int* triggerColumnIndeces = NORMAL_ORDER, const int *vvtColumnIndeces = NORMAL_ORDER);
bool haveMore();
void processLine(EngineTestHelper *eth);
void readLine(EngineTestHelper *eth);