From 417ac88c1df32fafb865d7ab53d3e83e1d4b99cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20M=C3=BCller?= <felix.mueller2@mailbox.tu-dresden.de>
Date: Wed, 17 Oct 2018 14:23:28 +0200
Subject: [PATCH] Changed instances of msg() to properly use the new format
---
examples/old/MTLPfcPrecon.inc.hpp | 2 +-
examples/old/pfc.cc | 5 ++---
src/amdis/Output.hpp | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/examples/old/MTLPfcPrecon.inc.hpp b/examples/old/MTLPfcPrecon.inc.hpp
index 6b4138f2..3b157262 100644
--- a/examples/old/MTLPfcPrecon.inc.hpp
+++ b/examples/old/MTLPfcPrecon.inc.hpp
@@ -11,7 +11,7 @@ namespace AMDiS
size_type n = num_rows(getM());
double delta = std::sqrt(M0 * getTau());
- msg("delta = ", delta);
+ msg("delta = {}", delta);
// helper-matrix MpL = M + delta*L
MpL.change_dim(n, n);
diff --git a/examples/old/pfc.cc b/examples/old/pfc.cc
index 984901fa..33a32e1f 100644
--- a/examples/old/pfc.cc
+++ b/examples/old/pfc.cc
@@ -101,9 +101,8 @@ int main(int argc, char** argv)
AdaptInstationary adapt("adapt", prob, adaptInfo, probInstat, adaptInfo);
adapt.adapt();
- msg("|mu| = ", two_norm(Mu.getVector()), ", ",
- "|nu| = ", two_norm(Nu.getVector()), ", ",
- "|psi| = ", two_norm(Psi.getVector()));
+ msg("|mu| = {}, |nu| = {}, |psi| = {}",
+ two_norm(Mu.getVector()), two_norm(Nu.getVector()), two_norm(Psi.getVector()));
AMDiS::finalize();
return 0;
diff --git a/src/amdis/Output.hpp b/src/amdis/Output.hpp
index f65f29e7..af4d5ff3 100644
--- a/src/amdis/Output.hpp
+++ b/src/amdis/Output.hpp
@@ -83,7 +83,7 @@ namespace AMDiS
/**
* Example:
* ```
- * msg("Hello ", "World: ", 123); // prints "Hello World: 123\n"
+ * msg("Hello {}: {}", "World", 123); // prints "Hello World: 123\n"
* ```
**/
template <class... Args>
@@ -97,7 +97,7 @@ namespace AMDiS
/**
* Example:
* ```
- * msg("Hello ", "World: ", 123); // prints "Hello World: 123"
+ * msg_("Hello {}: {}", "World", 123); // prints "Hello World: 123"
* ```
**/
template <class... Args>
--
GitLab