diff --git a/geostat.cpp b/geostat.cpp
index 0d5476a..512dc72 100644
--- a/geostat.cpp
+++ b/geostat.cpp
@@ -327,7 +327,7 @@ int main(int argc, char** argv) {
show_histogram(cc, &Cache::year, "Years", 1, 0);
// DT matrix
- short dt_table[11][11];
+ short count;
int n = 0;
std::cout << "
Difficulty / terrain matrix
\n";
@@ -341,11 +341,11 @@ int main(int argc, char** argv) {
for (int i = 2; i <= 10; i++) { // i -> diff in rows
std::cout << "" << i / 2.0 << " | ";
for (int j = 2; j <= 10; j++) { // j -> terr in cols
- dt_table[i][j] = std::count_if(cc.begin(), cc.end(), [i, j](Cache c) { return (c.diff == i / 2.0 && c.terr == j / 2.0); });
- if (dt_table[i][j] == 0)
+ count = std::count_if(cc.begin(), cc.end(), [i, j](Cache c) { return (c.diff == i / 2.0 && c.terr == j / 2.0); });
+ if (count == 0)
std::cout << "" << 0 << " | ";
else {
- std::cout << "" << dt_table[i][j] << " | ";
+ std::cout << "" << count << " | ";
n++;
}
}
@@ -358,7 +358,6 @@ int main(int argc, char** argv) {
std::cout << "\n";
// Days matrix
- short days_table[12][31];
n = 0;
std::cout << "Caching days matrix
\n";
@@ -372,11 +371,11 @@ int main(int argc, char** argv) {
for (int i = 1; i <= 12; i++) { // i -> months in rows
std::cout << "
" << i << " | ";
for (int j = 1; j <= 31; j++) { // j -> days in cols
- days_table[i-1][j-1] = std::count_if(cc.begin(), cc.end(), [i, j](Cache c) { return (c.date_tm.tm_mon == i && c.date_tm.tm_mday == j); });
- if (days_table[i-1][j-1] == 0)
+ count = std::count_if(cc.begin(), cc.end(), [i, j](Cache c) { return (c.date_tm.tm_mon == i && c.date_tm.tm_mday == j); });
+ if (count == 0)
std::cout << "" << 0 << " | ";
else {
- std::cout << "" << days_table[i-1][j-1] << " | ";
+ std::cout << "" << count << " | ";
n++;
}
}