From cd2da05443247b5df156f566fd9bab48632598ef Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Sat, 24 Sep 2022 23:07:55 -0400
Subject: [PATCH] progress

---
 unit_tests/logicdata_csv_reader.cpp | 5 +++--
 unit_tests/logicdata_csv_reader.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/unit_tests/logicdata_csv_reader.cpp b/unit_tests/logicdata_csv_reader.cpp
index c530c225b1..01df806a11 100644
--- a/unit_tests/logicdata_csv_reader.cpp
+++ b/unit_tests/logicdata_csv_reader.cpp
@@ -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) {
diff --git a/unit_tests/logicdata_csv_reader.h b/unit_tests/logicdata_csv_reader.h
index 2838cb043a..8c35b6d695 100644
--- a/unit_tests/logicdata_csv_reader.h
+++ b/unit_tests/logicdata_csv_reader.h
@@ -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);