From c368c8e15338f9412294cfc5daafba36bb47beb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Thu, 9 Apr 2020 20:25:20 +0200
Subject: [PATCH] cosmetics
---
CMakeLists.txt | 4 ++--
src/state_block/state_composite.cpp | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cb1b2028..3ae0e7b8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,8 +147,8 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}")
ENDIF()
# Configure config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h")
-message("WOLF CONFIG ${WOLF_CONFIG_DIR}/config.h")
-message("CONFIG DIRECTORY ${PROJECT_BINARY_DIR}")
+message(STATUS "WOLF CONFIG DIRECTORY ${WOLF_CONFIG_DIR}")
+message(STATUS "WOLF CONFIG FILE ${WOLF_CONFIG_DIR}/config.h")
include_directories("${PROJECT_BINARY_DIR}/conf")
# include spdlog (logging library)
diff --git a/src/state_block/state_composite.cpp b/src/state_block/state_composite.cpp
index 941e9376f..29154c33a 100644
--- a/src/state_block/state_composite.cpp
+++ b/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;
--
GitLab