From c23c59d50e60ac62a75f00cd8b316900262b04b1 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Wed, 13 Aug 2014 11:15:38 +0200
Subject: [PATCH] renamed ConfigContainer -> Configuration
refs #282
---
dune/stuff/functions.hh | 17 +++++++----------
dune/stuff/functions/ESV2007.hh | 24 ++++++++++++------------
dune/stuff/functions/checkerboard.hh | 12 ++++++------
dune/stuff/functions/constant.hh | 12 ++++++------
dune/stuff/functions/expression.hh | 12 ++++++------
dune/stuff/functions/spe10.hh | 24 ++++++++++++------------
dune/stuff/test/functions_functions.cc | 2 +-
7 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/dune/stuff/functions.hh b/dune/stuff/functions.hh
index 6d327c1f1..f751ab5b6 100644
--- a/dune/stuff/functions.hh
+++ b/dune/stuff/functions.hh
@@ -36,7 +36,7 @@ public:
protected:
template <class FunctionType>
- static std::unique_ptr<InterfaceType> call_create(const Common::ConfigContainer& config)
+ static std::unique_ptr<InterfaceType> call_create(const Common::Configuration& config)
{
if (config.empty())
return FunctionType::create();
@@ -50,8 +50,7 @@ public:
return {Functions::Constant<E, D, d, R, r, rC>::static_id()};
} // ... available(...)
- static Common::ConfigContainer default_config(const std::string type = available()[0],
- const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string type = available()[0], const std::string sub_name = "")
{
if (type == Functions::Constant<E, D, d, R, r, rC>::static_id())
return Functions::Constant<E, D, d, R, r, rC>::default_config(sub_name);
@@ -61,7 +60,7 @@ public:
} // ... default_config(...)
static std::unique_ptr<InterfaceType> create(const std::string type = available()[0],
- const Common::ConfigContainer config = Common::ConfigContainer())
+ const Common::Configuration config = Common::Configuration())
{
if (type == Functions::Constant<E, D, d, R, r, rC>::static_id())
return call_create<Functions::Constant<E, D, d, R, r, rC>>(config);
@@ -98,8 +97,7 @@ public:
return base;
} // ... available(...)
- static Common::ConfigContainer default_config(const std::string type = available()[0],
- const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string type = available()[0], const std::string sub_name = "")
{
if (type == Functions::Expression<E, D, d, R, r, rC>::static_id())
return Functions::Expression<E, D, d, R, r, rC>::default_config(sub_name);
@@ -110,7 +108,7 @@ public:
} // ... default_config(...)
static std::unique_ptr<InterfaceType> create(const std::string type = available()[0],
- const Common::ConfigContainer config = Common::ConfigContainer())
+ const Common::Configuration config = Common::Configuration())
{
if (type == Functions::Expression<E, D, d, R, r, rC>::static_id())
return BaseType::template call_create<Functions::Expression<E, D, d, R, r, rC>>(config);
@@ -144,8 +142,7 @@ public:
return base;
} // ... available(...)
- static Common::ConfigContainer default_config(const std::string type = available()[0],
- const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string type = available()[0], const std::string sub_name = "")
{
if (type == Functions::Expression<E, D, d, R, r, rC>::static_id())
return Functions::Expression<E, D, d, R, r, rC>::default_config(sub_name);
@@ -162,7 +159,7 @@ public:
} // ... default_config(...)
static std::unique_ptr<InterfaceType> create(const std::string type = available()[0],
- const Common::ConfigContainer config = Common::ConfigContainer())
+ const Common::Configuration config = Common::Configuration())
{
if (type == Functions::Expression<E, D, d, R, r, rC>::static_id())
return BaseType::template call_create<Functions::Expression<E, D, d, R, r, rC>>(config);
diff --git a/dune/stuff/functions/ESV2007.hh b/dune/stuff/functions/ESV2007.hh
index 9d9fdbcc5..a6ab2caf2 100644
--- a/dune/stuff/functions/ESV2007.hh
+++ b/dune/stuff/functions/ESV2007.hh
@@ -212,26 +212,26 @@ public:
return BaseType::static_id() + ".ESV2007.testcase1.force";
}
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["integration_order"] = "3";
config["name"] = static_id();
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// create
return Common::make_unique<ThisType>(cfg.get("integration_order", default_cfg.get<size_t>("integration_order")),
cfg.get("name", default_cfg.get<std::string>("name")));
@@ -320,26 +320,26 @@ public:
return BaseType::static_id() + ".ESV2007.testcase1.exactsolution";
}
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["integration_order"] = "3";
config["name"] = static_id();
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// create
return Common::make_unique<ThisType>(cfg.get("integration_order", default_cfg.get<size_t>("integration_order")),
cfg.get("name", default_cfg.get<std::string>("name")));
diff --git a/dune/stuff/functions/checkerboard.hh b/dune/stuff/functions/checkerboard.hh
index 5102c8285..e90a340d1 100644
--- a/dune/stuff/functions/checkerboard.hh
+++ b/dune/stuff/functions/checkerboard.hh
@@ -101,9 +101,9 @@ public:
return BaseType::static_id() + ".checkerboard";
}
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["lower_left"] = "[0.0 0.0 0.0]";
config["upper_right"] = "[1.0 1.0 1.0]";
config["num_elements"] = "[2 2 2]";
@@ -112,18 +112,18 @@ public:
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// calculate number of values and get values
auto num_elements = cfg.get("num_elements", default_cfg.get<std::vector<size_t>>("num_elements"), dimDomain);
size_t num_values = 1;
diff --git a/dune/stuff/functions/constant.hh b/dune/stuff/functions/constant.hh
index 3890e1603..242d23f90 100644
--- a/dune/stuff/functions/constant.hh
+++ b/dune/stuff/functions/constant.hh
@@ -96,26 +96,26 @@ public:
return BaseType::static_id() + ".constant";
}
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["value"] = Get<RangeFieldImp, rangeDim, rangeDimCols>::value_str();
config["name"] = static_id();
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
return Common::make_unique<ThisType>(cfg.get("value", default_cfg.get<RangeType>("value")),
cfg.get("name", default_cfg.get<std::string>("name")));
} // ... create(...)
diff --git a/dune/stuff/functions/expression.hh b/dune/stuff/functions/expression.hh
index f5c52d392..29a7d5ead 100644
--- a/dune/stuff/functions/expression.hh
+++ b/dune/stuff/functions/expression.hh
@@ -206,9 +206,9 @@ public:
return BaseType::static_id() + ".expression";
}
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["variable"] = "x";
config["expression"] = "[x[0] sin(x[0]) exp(x[0])]";
config["order"] = "3";
@@ -216,18 +216,18 @@ public:
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// create
return Common::make_unique<ThisType>(cfg.get("variable", default_cfg.get<std::string>("variable")),
cfg.get("expression", default_cfg.get<std::vector<std::string>>("expression")),
diff --git a/dune/stuff/functions/spe10.hh b/dune/stuff/functions/spe10.hh
index 8b9d6d411..d08d45695 100644
--- a/dune/stuff/functions/spe10.hh
+++ b/dune/stuff/functions/spe10.hh
@@ -97,9 +97,9 @@ private:
} // ... read_values_from_file(...)
public:
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["filename"] = "perm_case1.dat";
config["lower_left"] = "[0.0 0.0]";
config["upper_right"] = "[762.0 15.24]";
@@ -109,18 +109,18 @@ public:
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// create
return Common::make_unique<ThisType>(
cfg.get("filename", default_cfg.get<std::string>("filename")),
@@ -220,9 +220,9 @@ private:
} // ... read_values_from_file(...)
public:
- static Common::ConfigContainer default_config(const std::string sub_name = "")
+ static Common::Configuration default_config(const std::string sub_name = "")
{
- Common::ConfigContainer config;
+ Common::Configuration config;
config["filename"] = "perm_case1.dat";
config["lower_left"] = "[0.0 0.0]";
config["upper_right"] = "[762.0 15.24]";
@@ -232,18 +232,18 @@ public:
if (sub_name.empty())
return config;
else {
- Common::ConfigContainer tmp;
+ Common::Configuration tmp;
tmp.add(config, sub_name);
return tmp;
}
} // ... default_config(...)
- static std::unique_ptr<ThisType> create(const Common::ConfigContainer config = default_config(),
+ static std::unique_ptr<ThisType> create(const Common::Configuration config = default_config(),
const std::string sub_name = static_id())
{
// get correct config
- const Common::ConfigContainer cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
- const Common::ConfigContainer default_cfg = default_config();
+ const Common::Configuration cfg = config.has_sub(sub_name) ? config.sub(sub_name) : config;
+ const Common::Configuration default_cfg = default_config();
// create
return Common::make_unique<ThisType>(
cfg.get("filename", default_cfg.get<std::string>("filename")),
diff --git a/dune/stuff/test/functions_functions.cc b/dune/stuff/test/functions_functions.cc
index 3de60a535..fb32b650b 100644
--- a/dune/stuff/test/functions_functions.cc
+++ b/dune/stuff/test/functions_functions.cc
@@ -32,7 +32,7 @@
void check() const \
{ \
for (const std::string& type : FunctionsProvider::available()) { \
- const Dune::Stuff::Common::ConfigContainer config = FunctionsProvider::default_config(type); \
+ const Dune::Stuff::Common::Configuration config = FunctionsProvider::default_config(type); \
try { \
const std::unique_ptr<InterfaceType> function = FunctionsProvider::create(type, config); \
} catch (Dune::IOError&) { \
--
GitLab