From: Marc Fehling Date: Thu, 19 Jun 2025 08:41:46 +0000 (+0200) Subject: Pretty print XML output of ParameterHandler::print_parameters. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678949f569f1696780d68d727d52d9aed5d75d4d;p=dealii.git Pretty print XML output of ParameterHandler::print_parameters. --- diff --git a/doc/news/changes/minor/20250619Fehling b/doc/news/changes/minor/20250619Fehling new file mode 100644 index 0000000000..52ab3a3283 --- /dev/null +++ b/doc/news/changes/minor/20250619Fehling @@ -0,0 +1,3 @@ +Changed: ParameterHandler::print_parameters now pretty prints XML output. +
+(Marc Fehling, 2025/06/19) diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc index 1e36a1bc84..8ab8a34539 100644 --- a/source/base/parameter_handler.cc +++ b/source/base/parameter_handler.cc @@ -1445,7 +1445,12 @@ ParameterHandler::print_parameters(std::ostream &out, boost::property_tree::ptree single_node_tree; single_node_tree.add_child("ParameterHandler", current_entries); - write_xml(out, single_node_tree); + // set indentation character and indentation length + boost::property_tree::xml_writer_settings< + boost::property_tree::ptree::key_type> + settings(' ', 2); + + write_xml(out, single_node_tree, settings); return out; } diff --git a/tests/parameter_handler/parameter_acceptor_05.output b/tests/parameter_handler/parameter_acceptor_05.output index 7357ac8dba..0bd2f9d393 100644 --- a/tests/parameter_handler/parameter_acceptor_05.output +++ b/tests/parameter_handler/parameter_acceptor_05.output @@ -9,4 +9,17 @@ DEAL:parameters:Second Class::Second int: 5 DEAL:parameters:Second Class::Second string: bye bye DEAL::reading used_parameter_acceptor_05.xml DEAL:: -DEAL::true7.73hellofalse9.95bye bye +DEAL:: +DEAL:: +DEAL:: true +DEAL:: 7.7 +DEAL:: 3 +DEAL:: hello +DEAL:: +DEAL:: +DEAL:: false +DEAL:: 9.9 +DEAL:: 5 +DEAL:: bye bye +DEAL:: +DEAL:: diff --git a/tests/parameter_handler/parameter_acceptor_09.output b/tests/parameter_handler/parameter_acceptor_09.output index ca7aa0a934..83f1e2c66d 100644 --- a/tests/parameter_handler/parameter_acceptor_09.output +++ b/tests/parameter_handler/parameter_acceptor_09.output @@ -10,7 +10,19 @@ end DEAL::Generate and read input.xml -0, 0, 00, 0, 01[List of <[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 3...3 (inclusive)]0,1 + + + + 0, 0, 0 + 0, 0, 0 + + 1 + [List of <[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 3...3 (inclusive)] + 0,1 + + + + DEAL::Generate and read input.json { "Test": diff --git a/tests/parameter_handler/parameter_handler_27.output b/tests/parameter_handler/parameter_handler_27.output index db5c34a362..3059eaf819 100644 --- a/tests/parameter_handler/parameter_handler_27.output +++ b/tests/parameter_handler/parameter_handler_27.output @@ -14,7 +14,35 @@ end DEAL::XML format: DEAL::======================================== -truetrue1[Bool]1110[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]0CiaoCiao2[Anything]2 + + + + true + true + + 1 + [Bool] + 1 + + + 1 + 1 + + 0 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + 0 + + + Ciao + Ciao + + 2 + [Anything] + 2 + + + + DEAL::JSON format: DEAL::======================================== { diff --git a/tests/parameter_handler/parameter_handler_28.output b/tests/parameter_handler/parameter_handler_28.output index 76f1735884..24154dd1c9 100644 --- a/tests/parameter_handler/parameter_handler_28.output +++ b/tests/parameter_handler/parameter_handler_28.output @@ -9,7 +9,13 @@ end DEAL::ShortXML format: DEAL::======================================== -12 + + 1 + + 2 + + + DEAL::ShortJSON format: DEAL::======================================== { diff --git a/tests/parameter_handler/parameter_handler_read_xml.output b/tests/parameter_handler/parameter_handler_read_xml.output index d1ecf78ff8..1e8e0293dc 100644 --- a/tests/parameter_handler/parameter_handler_read_xml.output +++ b/tests/parameter_handler/parameter_handler_read_xml.output @@ -1,3 +1,60 @@ -21doc 10[Integer range -2147483648...2147483647 (inclusive)]32doc 21[Integer range -2147483648...2147483647 (inclusive)]7.14159266.1415926docs 36[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]225[Integer range -2147483648...2147483647 (inclusive)]__< & > ; /< & > ; /docs 14[Anything]2.2341.234doc 32[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]5.3214.321doc 43[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + 2 + 1 + doc 1 + 0 + [Integer range -2147483648...2147483647 (inclusive)] + + + 3 + 2 + doc 2 + 1 + [Integer range -2147483648...2147483647 (inclusive)] + + + + 7.1415926 + 6.1415926 + docs 3 + 6 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + 2 + 2 + + 5 + [Integer range -2147483648...2147483647 (inclusive)] + + + __< & > ; / + < & > ; / + docs 1 + 4 + [Anything] + + + + + 2.234 + 1.234 + doc 3 + 2 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + + 5.321 + 4.321 + doc 4 + 3 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + + + diff --git a/tests/parameter_handler/parameter_handler_write_xml.output b/tests/parameter_handler/parameter_handler_write_xml.output index d1a374dedc..9136d95be0 100644 --- a/tests/parameter_handler/parameter_handler_write_xml.output +++ b/tests/parameter_handler/parameter_handler_write_xml.output @@ -1,5 +1,77 @@ -11doc 10[Integer range -2147483648...2147483647 (inclusive)]22doc 21[Integer range -2147483648...2147483647 (inclusive)]6.14159266.1415926docs 36[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]225[Integer range -2147483648...2147483647 (inclusive)]< & > ; /< & > ; /docs 14[Anything]1.2341.234doc 32[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]4.3214.321doc 43[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + 1 + 1 + doc 1 + 0 + [Integer range -2147483648...2147483647 (inclusive)] + + + 2 + 2 + doc 2 + 1 + [Integer range -2147483648...2147483647 (inclusive)] + + + + 6.1415926 + 6.1415926 + docs 3 + 6 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + 2 + 2 + + 5 + [Integer range -2147483648...2147483647 (inclusive)] + + + < & > ; / + < & > ; / + docs 1 + 4 + [Anything] + + + + + 1.234 + 1.234 + doc 3 + 2 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + + 4.321 + 4.321 + doc 4 + 3 + [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)] + + + + + -126.14159262< & > ; /1.2344.321 + + 1 + 2 + + 6.1415926 + 2 + < & > ; / + + + 1.234 + + 4.321 + + + +