WIP: Resolve "Complete state vector new data structure?"

Closes #287 (closed)

Continues in !358 (closed)

src/state_block/state_composite.cpp

@@ -134,15 +134,15 @@ wolf::VectorComposite MatrixComposite::operator *(const VectorComposite &_x) con
 
 std::ostream& operator <<(std::ostream &_os, const MatrixComposite &_M)
 {
-    for (const auto &pair_row_cols : _M.matrix_composite_)
+    for (const auto &pair_rkey_row : _M.matrix_composite_)
     {
-        const auto row = pair_row_cols.first;
+        const auto rkey = pair_rkey_row.first;
 
-        for (const auto &pair_col_blk : pair_row_cols.second)
+        for (const auto &pair_ckey_mat : pair_rkey_row.second)
         {
-            const auto &col = pair_col_blk.first;
+            const auto &ckey = pair_ckey_mat.first;
 
-            _os << "\n  block(" << row << "," << col << ") = \n" << pair_col_blk.second;
+            _os << "\n  block(" << rkey << "," << ckey << ") = \n" << pair_ckey_mat.second;
         }
     }
     return _os;