From a1a51da722b8041a43d79df3e985269343045b35 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Mon, 3 Jun 2024 14:28:41 +0200 Subject: [PATCH] Follow general output precision in DFT approximation (#563) --- src/storm-dft/modelchecker/DFTModelChecker.cpp | 6 ++---- src/storm/utility/initialize.cpp | 12 ++++++++---- src/storm/utility/initialize.h | 6 ------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/storm-dft/modelchecker/DFTModelChecker.cpp b/src/storm-dft/modelchecker/DFTModelChecker.cpp index 81754fb303..0d49af5b58 100644 --- a/src/storm-dft/modelchecker/DFTModelChecker.cpp +++ b/src/storm-dft/modelchecker/DFTModelChecker.cpp @@ -371,13 +371,11 @@ typename DFTModelChecker::dft_results DFTModelChecker::che "Under-approximation " << approxResult.first << " is greater than over-approximation " << approxResult.second); totalTimer.stop(); if (printInfo && dftIOSettings.isShowDftStatisticsSet()) { - std::cout << "Result after iteration " << (iteration + 1) << ": (" << std::setprecision(10) << approxResult.first << ", " << approxResult.second - << ")\n"; + std::cout << "Result after iteration " << (iteration + 1) << ": (" << approxResult.first << ", " << approxResult.second << ")\n"; printTimings(); std::cout << '\n'; } else { - STORM_LOG_DEBUG("Result after iteration " << (iteration + 1) << ": (" << std::setprecision(10) << approxResult.first << ", " - << approxResult.second << ")"); + STORM_LOG_DEBUG("Result after iteration " << (iteration + 1) << ": (" << approxResult.first << ", " << approxResult.second << ")"); } totalTimer.start(); diff --git a/src/storm/utility/initialize.cpp b/src/storm/utility/initialize.cpp index 886cd0e844..c21adb4d0a 100644 --- a/src/storm/utility/initialize.cpp +++ b/src/storm/utility/initialize.cpp @@ -21,6 +21,14 @@ void initializeLogger() { sink->setFormatter(fptr); } +/*! + * Set number of digits for printing output. + * @param digits Number of digits to print. + */ +void setOutputDigits(int digits) { + std::cout.precision(digits); +} + void setUp() { initializeLogger(); setOutputDigits(10); @@ -30,10 +38,6 @@ void cleanUp() { // Intentionally left empty. } -void setOutputDigits(int digits) { - std::cout.precision(digits); -} - void setOutputDigitsFromGeneralPrecision(double precision) { if (precision >= 1 || precision < 0) { setOutputDigits(10); diff --git a/src/storm/utility/initialize.h b/src/storm/utility/initialize.h index c2e4646c66..da6d0e1def 100644 --- a/src/storm/utility/initialize.h +++ b/src/storm/utility/initialize.h @@ -19,12 +19,6 @@ void setUp(); */ void cleanUp(); -/*! - * Set number of digits for printing output. - * @param digits Number of digits to print. - */ -void setOutputDigits(int digits); - /*! * Set number of digits for printing output from given precision requirement. * For a precision of 1e-n we output at least n digits.