From ea87ced40d55fa001d409786c43bc619a86a98bd Mon Sep 17 00:00:00 2001 From: Auto Format Date: Wed, 4 Sep 2024 19:00:09 +0000 Subject: [PATCH 1/2] Applied code formatting --- src/storm-dft/storage/DFTLayoutInfo.h | 4 ++-- src/storm-gspn/storage/gspn/PlacementInfo.h | 4 ++-- src/storm-pars/analysis/Order.cpp | 3 +-- .../derivative/SparseDerivativeInstantiationModelChecker.h | 2 +- src/storm-pars/modelchecker/region/RegionModelChecker.cpp | 6 ++---- src/storm-parsers/parser/JaniParser.h | 2 +- src/storm/logic/BinaryBooleanPathFormula.h | 2 +- src/storm/logic/BinaryBooleanStateFormula.h | 2 +- src/storm/logic/Formula.h | 2 +- src/storm/logic/PathFormula.h | 2 +- src/storm/logic/StateFormula.h | 2 +- src/storm/logic/UnaryBooleanPathFormula.h | 2 +- .../lexicographic/lexicographicModelCheckerHelper.h | 2 +- src/storm/storage/jani/eliminator/ArrayEliminator.cpp | 2 +- 14 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/storm-dft/storage/DFTLayoutInfo.h b/src/storm-dft/storage/DFTLayoutInfo.h index ca5054fdcb..5343a8dc2e 100644 --- a/src/storm-dft/storage/DFTLayoutInfo.h +++ b/src/storm-dft/storage/DFTLayoutInfo.h @@ -4,8 +4,8 @@ namespace storm::dft { namespace storage { struct DFTLayoutInfo { - DFTLayoutInfo() : x(20.0), y(20.0){}; - DFTLayoutInfo(double x, double y) : x(x), y(y){}; + DFTLayoutInfo() : x(20.0), y(20.0) {}; + DFTLayoutInfo(double x, double y) : x(x), y(y) {}; // x location double x; diff --git a/src/storm-gspn/storage/gspn/PlacementInfo.h b/src/storm-gspn/storage/gspn/PlacementInfo.h index 97334f72de..c79d010557 100644 --- a/src/storm-gspn/storage/gspn/PlacementInfo.h +++ b/src/storm-gspn/storage/gspn/PlacementInfo.h @@ -3,8 +3,8 @@ namespace storm { namespace gspn { struct LayoutInfo { - LayoutInfo(){}; - LayoutInfo(double x, double y, double rotation = 0.0) : x(x), y(y), rotation(rotation){}; + LayoutInfo() {}; + LayoutInfo(double x, double y, double rotation = 0.0) : x(x), y(y), rotation(rotation) {}; // x location double x = 0.0; diff --git a/src/storm-pars/analysis/Order.cpp b/src/storm-pars/analysis/Order.cpp index fb9b79861b..8b46cefd49 100644 --- a/src/storm-pars/analysis/Order.cpp +++ b/src/storm-pars/analysis/Order.cpp @@ -560,8 +560,7 @@ void Order::setDoneState(uint_fast64_t stateNumber) { void Order::toDotOutput() const { // Graphviz Output start - STORM_PRINT("Dot Output:\n" - << "digraph model {\n"); + STORM_PRINT("Dot Output:\n" << "digraph model {\n"); // Vertices of the digraph storm::storage::BitVector stateCoverage = storm::storage::BitVector(doneStates); diff --git a/src/storm-pars/derivative/SparseDerivativeInstantiationModelChecker.h b/src/storm-pars/derivative/SparseDerivativeInstantiationModelChecker.h index a1d48e2cb3..3cf4ddb26f 100644 --- a/src/storm-pars/derivative/SparseDerivativeInstantiationModelChecker.h +++ b/src/storm-pars/derivative/SparseDerivativeInstantiationModelChecker.h @@ -92,7 +92,7 @@ class SparseDerivativeInstantiationModelChecker { template class SignedGradientDescentTerminationCondition : public solver::TerminationCondition { public: - SignedGradientDescentTerminationCondition(uint64_t initialState) : initialState(initialState){}; + SignedGradientDescentTerminationCondition(uint64_t initialState) : initialState(initialState) {}; bool terminateNow(std::function const& valueGetter, solver::SolverGuarantee const& guarantee) const { if (guarantee == solver::SolverGuarantee::GreaterOrEqual && valueGetter(initialState) > utility::convertNumber(1e-6)) { diff --git a/src/storm-pars/modelchecker/region/RegionModelChecker.cpp b/src/storm-pars/modelchecker/region/RegionModelChecker.cpp index 490b2e3ef0..e219b8ec68 100644 --- a/src/storm-pars/modelchecker/region/RegionModelChecker.cpp +++ b/src/storm-pars/modelchecker/region/RegionModelChecker.cpp @@ -79,8 +79,7 @@ std::unique_ptr uint_fast64_t numOfAnalyzedRegions = 0; CoefficientType displayedProgress = storm::utility::zero(); if (storm::settings::getModule().isShowStatisticsSet()) { - STORM_PRINT_AND_LOG("Progress (solved fraction) :\n" - << "0% ["); + STORM_PRINT_AND_LOG("Progress (solved fraction) :\n" << "0% ["); while (displayedProgress < storm::utility::one() - thresholdAsCoefficient) { STORM_PRINT_AND_LOG(" "); displayedProgress += storm::utility::convertNumber(0.01); @@ -89,8 +88,7 @@ std::unique_ptr STORM_PRINT_AND_LOG("-"); displayedProgress += storm::utility::convertNumber(0.01); } - STORM_PRINT_AND_LOG("] 100%\n" - << " ["); + STORM_PRINT_AND_LOG("] 100%\n" << " ["); displayedProgress = storm::utility::zero(); } diff --git a/src/storm-parsers/parser/JaniParser.h b/src/storm-parsers/parser/JaniParser.h index 897d9fdb13..5982b2583c 100644 --- a/src/storm-parsers/parser/JaniParser.h +++ b/src/storm-parsers/parser/JaniParser.h @@ -54,7 +54,7 @@ class JaniParser { globalVars(globalVars), globalFunctions(globalFunctions), localVars(localVars), - localFunctions(localFunctions){}; + localFunctions(localFunctions) {}; Scope(Scope const& other) = default; std::string description; diff --git a/src/storm/logic/BinaryBooleanPathFormula.h b/src/storm/logic/BinaryBooleanPathFormula.h index c6d4f71562..f580697d94 100644 --- a/src/storm/logic/BinaryBooleanPathFormula.h +++ b/src/storm/logic/BinaryBooleanPathFormula.h @@ -16,7 +16,7 @@ class BinaryBooleanPathFormula : public BinaryPathFormula { BinaryBooleanPathFormula(OperatorType operatorType, std::shared_ptr const& leftSubformula, std::shared_ptr const& rightSubformula, FormulaContext context = FormulaContext::Probability); - virtual ~BinaryBooleanPathFormula(){ + virtual ~BinaryBooleanPathFormula() { // Intentionally left empty. }; diff --git a/src/storm/logic/BinaryBooleanStateFormula.h b/src/storm/logic/BinaryBooleanStateFormula.h index b31b1606c4..b561a683d1 100644 --- a/src/storm/logic/BinaryBooleanStateFormula.h +++ b/src/storm/logic/BinaryBooleanStateFormula.h @@ -15,7 +15,7 @@ class BinaryBooleanStateFormula : public BinaryStateFormula { BinaryBooleanStateFormula(OperatorType operatorType, std::shared_ptr const& leftSubformula, std::shared_ptr const& rightSubformula); - virtual ~BinaryBooleanStateFormula(){ + virtual ~BinaryBooleanStateFormula() { // Intentionally left empty. }; diff --git a/src/storm/logic/Formula.h b/src/storm/logic/Formula.h index 192c4e2e63..4697e03917 100644 --- a/src/storm/logic/Formula.h +++ b/src/storm/logic/Formula.h @@ -30,7 +30,7 @@ class FormulaInformation; class Formula : public std::enable_shared_from_this { public: // Make the destructor virtual to allow deletion of objects of subclasses via a pointer to this class. - virtual ~Formula(){ + virtual ~Formula() { // Intentionally left empty. }; diff --git a/src/storm/logic/PathFormula.h b/src/storm/logic/PathFormula.h index 479c82573b..799d9f59b2 100644 --- a/src/storm/logic/PathFormula.h +++ b/src/storm/logic/PathFormula.h @@ -7,7 +7,7 @@ namespace storm { namespace logic { class PathFormula : public Formula { public: - virtual ~PathFormula(){ + virtual ~PathFormula() { // Intentionally left empty. }; diff --git a/src/storm/logic/StateFormula.h b/src/storm/logic/StateFormula.h index 7c5612de61..26487d0453 100644 --- a/src/storm/logic/StateFormula.h +++ b/src/storm/logic/StateFormula.h @@ -7,7 +7,7 @@ namespace storm { namespace logic { class StateFormula : public Formula { public: - virtual ~StateFormula(){ + virtual ~StateFormula() { // Intentionally left empty. }; diff --git a/src/storm/logic/UnaryBooleanPathFormula.h b/src/storm/logic/UnaryBooleanPathFormula.h index 9f76271dee..49ce2eea11 100644 --- a/src/storm/logic/UnaryBooleanPathFormula.h +++ b/src/storm/logic/UnaryBooleanPathFormula.h @@ -13,7 +13,7 @@ class UnaryBooleanPathFormula : public UnaryPathFormula { UnaryBooleanPathFormula(OperatorType operatorType, std::shared_ptr const& subformula, FormulaContext context = FormulaContext::Probability); - virtual ~UnaryBooleanPathFormula(){ + virtual ~UnaryBooleanPathFormula() { // Intentionally left empty. }; diff --git a/src/storm/modelchecker/lexicographic/lexicographicModelCheckerHelper.h b/src/storm/modelchecker/lexicographic/lexicographicModelCheckerHelper.h index 10e81d09bf..344a997c27 100644 --- a/src/storm/modelchecker/lexicographic/lexicographicModelCheckerHelper.h +++ b/src/storm/modelchecker/lexicographic/lexicographicModelCheckerHelper.h @@ -32,7 +32,7 @@ class lexicographicModelCheckerHelper : public helper::SingleValueModelCheckerHe // init lexicographicModelCheckerHelper(storm::logic::MultiObjectiveFormula const& formula, storm::storage::SparseMatrix const& transitionMatrix) - : _transitionMatrix(transitionMatrix), formula(formula){}; + : _transitionMatrix(transitionMatrix), formula(formula) {}; /*! * Returns the product of a model and the product-automaton of all sub-formulae of the multi-objective formula diff --git a/src/storm/storage/jani/eliminator/ArrayEliminator.cpp b/src/storm/storage/jani/eliminator/ArrayEliminator.cpp index 73bbc91066..fd6f7abc33 100644 --- a/src/storm/storage/jani/eliminator/ArrayEliminator.cpp +++ b/src/storm/storage/jani/eliminator/ArrayEliminator.cpp @@ -30,7 +30,7 @@ class ArrayReplacementsCollectorExpressionVisitor : public storm::expressions::E typedef typename ArrayEliminatorData::Replacement Replacement; typedef std::unordered_map ReplMap; - ArrayReplacementsCollectorExpressionVisitor(Model& model) : model(model), converged(false), declaringAutomaton(nullptr){}; + ArrayReplacementsCollectorExpressionVisitor(Model& model) : model(model), converged(false), declaringAutomaton(nullptr) {}; virtual ~ArrayReplacementsCollectorExpressionVisitor() = default; /*! From e3ac83c7813c477eb6c728bf7f3ea53e998f6e56 Mon Sep 17 00:00:00 2001 From: Auto Format Date: Wed, 4 Sep 2024 19:00:09 +0000 Subject: [PATCH 2/2] Add code formatting commit to .git-blame-ignore-revs --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 1c7d6d61de..0a9692c008 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -14,3 +14,4 @@ e58679da05190fe064ca063b07ac56428162a8fb a177724097d3f807a6b8950b1cd378c34d040d1b 5016fac7d4014f1113c3d410a65aa5b39a74be64 c0dae886d1e8283a783ab884f64b443e436c106b +ea87ced40d55fa001d409786c43bc619a86a98bd