From: Jean-Paul Pelteret Date: Sun, 14 Apr 2019 08:56:15 +0000 (+0200) Subject: Add some SD-related utility functions X-Git-Tag: v9.1.0-rc1~195^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01c49cb26b25082af43cdb0ffc7183acf40c4e7c;p=dealii.git Add some SD-related utility functions --- diff --git a/include/deal.II/differentiation/sd.h b/include/deal.II/differentiation/sd.h index 0366a5fbd9..e618da4646 100644 --- a/include/deal.II/differentiation/sd.h +++ b/include/deal.II/differentiation/sd.h @@ -24,6 +24,7 @@ # include # include # include +# include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/differentiation/sd/symengine_utilities.h b/include/deal.II/differentiation/sd/symengine_utilities.h index e9f64c5716..69188a8634 100644 --- a/include/deal.II/differentiation/sd/symengine_utilities.h +++ b/include/deal.II/differentiation/sd/symengine_utilities.h @@ -49,12 +49,97 @@ namespace Differentiation convert_expression_vector_to_basic_vector( const SD::types::symbol_vector &symbol_vector); + /** + * Extract the symbols (key entries) from a substitution map. + * + * @note It is guarenteed that the order of extraction of data into the + * output vector is the same as that for extract_values(). + * That is to say that the unzipped key and value pairs as given by + * extract_symbols() and extract_values() always have a 1:1 + * correspondence. + */ + SD::types::symbol_vector + extract_symbols(const SD::types::substitution_map &substitution_values); + + /** + * Extract the values from a substitution map. + * The value entries will be converted into the @p NumberType given + * as a template parameter to this function via the @p ExpressionType. + * + * @note It is guarenteed that the order of extraction of data into the + * output vector is the same as that for extract_symbols(). + * That is to say that the unzipped key and value pairs as given by + * extract_symbols() and extract_values() always have a 1:1 + * correspondence. + */ + template + std::vector + extract_values(const SD::types::substitution_map &substitution_values); + + /** + * Print the key and value pairs stored in a substitution map. + */ + template + StreamType & + print_substitution_map( + StreamType & stream, + const SD::types::substitution_map &symbol_value_map); + } // namespace Utilities } // namespace SD } // namespace Differentiation +/* -------------------- inline and template functions ------------------ */ + + +# ifndef DOXYGEN + + +namespace Differentiation +{ + namespace SD + { + namespace Utilities + { + template + std::vector + extract_values(const SD::types::substitution_map &substitution_values) + { + std::vector values; + values.reserve(substitution_values.size()); + + for (const auto &entry : substitution_values) + values.push_back( + static_cast(ExpressionType(entry.second))); + + return values; + } + + + template + StreamType & + print_substitution_map( + StreamType & stream, + const SD::types::substitution_map &symbol_value_map) + { + for (const auto &entry : symbol_value_map) + stream << entry.first << " = " << entry.second << "\n"; + + stream << std::flush; + return stream; + } + + } // namespace Utilities + + } // namespace SD +} // namespace Differentiation + + +# endif // DOXYGEN + + DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_WITH_SYMENGINE diff --git a/source/differentiation/sd/symengine_utilities.cc b/source/differentiation/sd/symengine_utilities.cc index 9697316831..3d499a9e4a 100644 --- a/source/differentiation/sd/symengine_utilities.cc +++ b/source/differentiation/sd/symengine_utilities.cc @@ -52,6 +52,22 @@ namespace Differentiation return symb_vec; } + + SD::types::symbol_vector + extract_symbols(const SD::types::substitution_map &substitution_values) + { + SD::types::symbol_vector symbols; + symbols.reserve(substitution_values.size()); + + for (typename SD::types::substitution_map::const_iterator it = + substitution_values.begin(); + it != substitution_values.end(); + ++it) + symbols.push_back(it->first); + + return symbols; + } + } // namespace Utilities } // namespace SD diff --git a/tests/symengine/symengine_utilities_01.cc b/tests/symengine/symengine_utilities_01.cc new file mode 100644 index 0000000000..00d6efe9c5 --- /dev/null +++ b/tests/symengine/symengine_utilities_01.cc @@ -0,0 +1,57 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2019 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + +// Check that substitution map decomposition and printing work as expected + +#include + +#include "../tests.h" + +using namespace dealii; +namespace SD = Differentiation::SD; + + +int +main() +{ + initlog(); + + using SD_number_t = SD::Expression; + + const SD::types::substitution_map sub_map{ + {SD_number_t("c"), SD_number_t(1.0)}, + {SD_number_t("b"), SD_number_t(2)}, + {SD_number_t("a"), SD_number_t(3.0f)}}; + + const SD::types::symbol_vector symbols = + SD::Utilities::extract_symbols(sub_map); + const std::vector values = + SD::Utilities::extract_values(sub_map); + Assert(values.size() == symbols.size(), + ExcDimensionMismatch(values.size(), symbols.size())); + + // Print the map itself (this should be dictionary ordered) + deallog << "Print substitution map" << std::endl; + SD::Utilities::print_substitution_map(deallog, sub_map); + + // Print the extracted symbol-value pairs (the ordering should match that of + // the map) + deallog << "Print extracted symbol-value pairs" << std::endl; + for (unsigned int i = 0; i < symbols.size(); ++i) + deallog << symbols[i] << " = " << values[i] << std::endl; + + deallog << "OK" << std::endl; +} diff --git a/tests/symengine/symengine_utilities_01.output b/tests/symengine/symengine_utilities_01.output new file mode 100644 index 0000000000..ddbe32bbc1 --- /dev/null +++ b/tests/symengine/symengine_utilities_01.output @@ -0,0 +1,10 @@ + +DEAL::Print substitution map +DEAL::a = 3.0 +b = 2 +c = 1.0 +Print extracted symbol-value pairs +DEAL::a = 3.00000 +DEAL::b = 2.00000 +DEAL::c = 1.00000 +DEAL::OK