diff --git a/CMakeLists.txt b/CMakeLists.txt index 67191b0..3cea25e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(COSC-4P80-Assignment-1 VERSION 14.2.1) +project(COSC-4P80-Assignment-1 VERSION 14.2.2) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) diff --git a/src/main.cpp b/src/main.cpp index 459f0ef..dff61dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -156,11 +156,35 @@ int main() for (const auto& [index, value] : blt::enumerate(part_c_2_inputs).skip(2).take(3)) BLT_TRACE_STREAM << index << " : " << value.vec_from_column_row() << '\n'; - for (const auto& [a, b] : blt::in_pairs(part_a_inputs, part_a_outputs)) + BLT_TRACE(""); + + for (const auto& [a, b] : blt::in_pairs(part_a_inputs, part_a_outputs).enumerate()) { - BLT_TRACE_STREAM << a << " : " << b << "\n"; + auto& [ma, mb] = b; + BLT_TRACE_STREAM << a << " : " << ma.vec_from_column_row() << " " << mb.vec_from_column_row() << "\n"; } - + + BLT_TRACE(""); + + for (const auto& [a, b] : blt::in_pairs(part_a_inputs, part_a_outputs).rev()) + { + BLT_TRACE_STREAM << a.vec_from_column_row() << " : " << b.vec_from_column_row() << "\n"; + } + + BLT_TRACE(""); + + for (const auto& [a, b] : blt::in_pairs(part_a_inputs, part_a_outputs).take(1)) + { + BLT_TRACE_STREAM << a.vec_from_column_row() << " : " << b.vec_from_column_row() << "\n"; + } + + BLT_TRACE(""); + + for (const auto& [a, b] : blt::in_pairs(part_a_inputs, part_a_outputs).skip(1)) + { + BLT_TRACE_STREAM << a.vec_from_column_row() << " : " << b.vec_from_column_row() << "\n"; + } + // BLT_TRACE("%s", blt::type_string::type>().c_str());