Skip to content

Replaced isLess in DFTModelChecker #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
volkm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replaced isLess in DFTModelChecker #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027bb90
Replaced isLess in DFTModelChecker
volkm Dec 3, 2025
d864021
Removed unused variables
volkm Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions src/storm-dft/modelchecker/DFTModelChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
#include "storm-dft/api/storm-dft.h"
#include "storm-dft/builder/ExplicitDFTModelBuilder.h"
#include "storm-dft/settings/modules/DftIOSettings.h"
#include "storm-dft/settings/modules/FaultTreeSettings.h"
#include "storm-dft/utility/SymmetryFinder.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/builder/ParallelCompositionBuilder.h"
#include "storm/exceptions/InvalidModelException.h"
#include "storm/io/DirectEncodingExporter.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "storm/models/ModelType.h"
Expand Down Expand Up @@ -299,14 +297,7 @@ typename DFTModelChecker<ValueType>::dft_results DFTModelChecker<ValueType>::che
STORM_LOG_TRACE("Symmetries: \n" << symmetries);
}

auto const& generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
ValueType const precision = std::is_same<ValueType, storm::RationalFunction>::value
? storm::utility::zero<ValueType>()
: storm::utility::convertNumber<ValueType>(generalSettings.getPrecision());
if (approximationError > 0.0) {
// Comparator for checking the error of the approximation
storm::utility::ConstantsComparator<ValueType> comparator(precision);

// Build approximate Markov Automata for lower and upper bound
approximation_result approxResult = std::make_pair(storm::utility::zero<ValueType>(), storm::utility::zero<ValueType>());
std::shared_ptr<storm::models::sparse::Model<ValueType>> model;
Expand Down Expand Up @@ -356,7 +347,7 @@ typename DFTModelChecker<ValueType>::dft_results DFTModelChecker<ValueType>::che
// Check lower bounds
newResult = checkModel(model, {property});
STORM_LOG_ASSERT(newResult.size() == 1, "Wrong size for result vector.");
STORM_LOG_ASSERT(iteration == 0 || !comparator.isLess(newResult[0], approxResult.first),
STORM_LOG_ASSERT(iteration == 0 || storm::utility::isNonNegative(newResult[0] - approxResult.first),
"New under-approximation " << newResult[0] << " is smaller than old result " << approxResult.first);
approxResult.first = newResult[0];

Expand All @@ -368,11 +359,11 @@ typename DFTModelChecker<ValueType>::dft_results DFTModelChecker<ValueType>::che
// Check upper bound
newResult = checkModel(model, {property});
STORM_LOG_ASSERT(newResult.size() == 1, "Wrong size for result vector.");
STORM_LOG_ASSERT(iteration == 0 || !comparator.isLess(approxResult.second, newResult[0]),
STORM_LOG_ASSERT(iteration == 0 || storm::utility::isNonNegative(approxResult.second - newResult[0]),
"New over-approximation " << newResult[0] << " is greater than old result " << approxResult.second);
approxResult.second = newResult[0];

STORM_LOG_ASSERT(comparator.isLess(approxResult.first, approxResult.second) || comparator.isEqual(approxResult.first, approxResult.second),
STORM_LOG_ASSERT(storm::utility::isNonNegative(approxResult.second - approxResult.first),
"Under-approximation " << approxResult.first << " is greater than over-approximation " << approxResult.second);
totalTimer.stop();
if (printInfo && dftIOSettings.isShowDftStatisticsSet()) {
Expand All @@ -398,7 +389,6 @@ typename DFTModelChecker<ValueType>::dft_results DFTModelChecker<ValueType>::che
return results;
} else {
// Build a single Markov Automaton
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
STORM_LOG_DEBUG("Building Model...");
storm::dft::builder::ExplicitDFTModelBuilder<ValueType> builder(dft, symmetries);
builder.buildModel(0, 0.0);
Expand Down
14 changes: 6 additions & 8 deletions src/storm-dft/modelchecker/DFTModelChecker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#pragma once

#include "storm-dft/storage/DFT.h"
#include "storm-dft/utility/RelevantEvents.h"
#include "storm/api/storm.h"
#include "storm/logic/Formula.h"
#include "storm/modelchecker/results/CheckResult.h"
#include "storm/utility/Stopwatch.h"

#include "storm-dft/storage/DFT.h"
#include "storm-dft/utility/RelevantEvents.h"

namespace storm::dft {
namespace modelchecker {

Expand Down Expand Up @@ -48,9 +46,9 @@ class DFTModelChecker {
* @param allowDCForRelevant Whether to allow Don't Care propagation for relevant events
* @param approximationError Error allowed for approximation. Value 0 indicates no approximation.
* @param approximationHeuristic Heuristic used for state space exploration.
* @param eliminateChains If true, chains of non-Markovian states are elimianted from the resulting MA
* @param eliminateChains If true, chains of non-Markovian states are eliminated from the resulting MA
* @param labelBehavior Behavior of labels of eliminated states
* @return Model checking results for the given properties..
* @return Model checking results for the given properties.
*/
dft_results check(storm::dft::storage::DFT<ValueType> const& origDft, property_vector const& properties, bool symred = true,
bool allowModularisation = true, storm::dft::utility::RelevantEvents const& relevantEvents = {}, bool allowDCForRelevant = false,
Expand Down Expand Up @@ -95,7 +93,7 @@ class DFTModelChecker {
* @param allowDCForRelevant Whether to allow Don't Care propagation for relevant events
* @param approximationError Error allowed for approximation. Value 0 indicates no approximation.
* @param approximationHeuristic Heuristic used for approximation.
* @param eliminateChains If true, chains of non-Markovian states are elimianted from the resulting MA
* @param eliminateChains If true, chains of non-Markovian states are eliminated from the resulting MA
* @param labelBehavior Behavior of labels of eliminated states
* @return Model checking results (or in case of approximation two results for lower and upper bound)
*/
Expand Down Expand Up @@ -131,7 +129,7 @@ class DFTModelChecker {
* @param allowDCForRelevant Whether to allow Don't Care propagation for relevant events
* @param approximationError Error allowed for approximation. Value 0 indicates no approximation.
* @param approximationHeuristic Heuristic used for approximation.
* @param eliminateChains If true, chains of non-Markovian states are elimianted from the resulting MA
* @param eliminateChains If true, chains of non-Markovian states are eliminated from the resulting MA
* @param labelBehavior Behavior of labels of eliminated states
*
* @return Model checking result
Expand Down