From a8d03df173021ea6fa6258c207c7dc30449af455 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 28 Jan 2022 12:54:16 +0100
Subject: [PATCH] cleanup
---
kernel/fstdata.cc | 14 +-------------
kernel/fstdata.h | 1 -
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/kernel/fstdata.cc b/kernel/fstdata.cc
index d700f61b6..9170da45e 100644
--- a/kernel/fstdata.cc
+++ b/kernel/fstdata.cc
@@ -164,7 +164,6 @@ void FstData::reconstruct_callback_attimes(uint64_t pnt_time, fstHandle pnt_faci
handle_to_data[c.first].push_back(std::make_pair(time,c.second));
size_t index = handle_to_data[c.first].size() - 1;
time_to_index[c.first][time] = index;
- index_to_time[c.first][index] = time;
}
sample_times_ndx++;
}
@@ -176,7 +175,6 @@ void FstData::reconstructAtTimes(std::vector<fstHandle> &signal, std::vector<uin
{
handle_to_data.clear();
time_to_index.clear();
- index_to_time.clear();
last_data.clear();
sample_times_ndx = 0;
sample_times = time;
@@ -192,7 +190,6 @@ void FstData::reconstructAtTimes(std::vector<fstHandle> &signal, std::vector<uin
handle_to_data[c.first].push_back(std::make_pair(time.back(),c.second));
size_t index = handle_to_data[c.first].size() - 1;
time_to_index[c.first][time.back()] = index;
- index_to_time[c.first][index] = time.back();
}
}
}
@@ -201,7 +198,6 @@ void FstData::reconstructAllAtTimes(std::vector<uint64_t> time)
{
handle_to_data.clear();
time_to_index.clear();
- index_to_time.clear();
last_data.clear();
sample_times_ndx = 0;
sample_times = time;
@@ -216,7 +212,6 @@ void FstData::reconstructAllAtTimes(std::vector<uint64_t> time)
handle_to_data[c.first].push_back(std::make_pair(time.back(),c.second));
size_t index = handle_to_data[c.first].size() - 1;
time_to_index[c.first][time.back()] = index;
- index_to_time[c.first][index] = time.back();
}
}
}
@@ -230,13 +225,6 @@ std::string FstData::valueAt(fstHandle signal, uint64_t time)
size_t index = time_to_index[signal][time];
return data.at(index).second;
} else {
- size_t index = 0;
- for(size_t i = 0; i< data.size(); i++) {
- uint64_t t = index_to_time[signal][i];
- if (t > time)
- break;
- index = i;
- }
- return data.at(index).second;
+ log_error("No data for signal %d at time %d\n", (int)signal, (int)time);
}
}
diff --git a/kernel/fstdata.h b/kernel/fstdata.h
index 5d4899f47..8095981a2 100644
--- a/kernel/fstdata.h
+++ b/kernel/fstdata.h
@@ -66,7 +66,6 @@ private:
std::map<fstHandle, std::vector<std::pair<uint64_t, std::string>>> handle_to_data;
std::map<fstHandle, std::string> last_data;
std::map<fstHandle, std::map<uint64_t, size_t>> time_to_index;
- std::map<fstHandle, std::map<size_t, uint64_t>> index_to_time;
std::vector<uint64_t> sample_times;
size_t sample_times_ndx;
double timescale;