Skip to content

Commit

Permalink
Code formatting (moves-rwth#615)
Browse files Browse the repository at this point in the history
  • Loading branch information
volkm authored Sep 4, 2024
2 parents ef92a81 + e3ac83c commit d61ad71
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 20 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ e58679da05190fe064ca063b07ac56428162a8fb
a177724097d3f807a6b8950b1cd378c34d040d1b
5016fac7d4014f1113c3d410a65aa5b39a74be64
c0dae886d1e8283a783ab884f64b443e436c106b
ea87ced40d55fa001d409786c43bc619a86a98bd
4 changes: 2 additions & 2 deletions src/storm-dft/storage/DFTLayoutInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/storm-gspn/storage/gspn/PlacementInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/storm-pars/analysis/Order.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class SparseDerivativeInstantiationModelChecker {
template<typename ValueType>
class SignedGradientDescentTerminationCondition : public solver::TerminationCondition<ValueType> {
public:
SignedGradientDescentTerminationCondition(uint64_t initialState) : initialState(initialState){};
SignedGradientDescentTerminationCondition(uint64_t initialState) : initialState(initialState) {};

bool terminateNow(std::function<ValueType(uint64_t const&)> const& valueGetter, solver::SolverGuarantee const& guarantee) const {
if (guarantee == solver::SolverGuarantee::GreaterOrEqual && valueGetter(initialState) > utility::convertNumber<ValueType>(1e-6)) {
Expand Down
6 changes: 2 additions & 4 deletions src/storm-pars/modelchecker/region/RegionModelChecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ std::unique_ptr<storm::modelchecker::RegionRefinementCheckResult<ParametricType>
uint_fast64_t numOfAnalyzedRegions = 0;
CoefficientType displayedProgress = storm::utility::zero<CoefficientType>();
if (storm::settings::getModule<storm::settings::modules::CoreSettings>().isShowStatisticsSet()) {
STORM_PRINT_AND_LOG("Progress (solved fraction) :\n"
<< "0% [");
STORM_PRINT_AND_LOG("Progress (solved fraction) :\n" << "0% [");
while (displayedProgress < storm::utility::one<CoefficientType>() - thresholdAsCoefficient) {
STORM_PRINT_AND_LOG(" ");
displayedProgress += storm::utility::convertNumber<CoefficientType>(0.01);
Expand All @@ -89,8 +88,7 @@ std::unique_ptr<storm::modelchecker::RegionRefinementCheckResult<ParametricType>
STORM_PRINT_AND_LOG("-");
displayedProgress += storm::utility::convertNumber<CoefficientType>(0.01);
}
STORM_PRINT_AND_LOG("] 100%\n"
<< " [");
STORM_PRINT_AND_LOG("] 100%\n" << " [");
displayedProgress = storm::utility::zero<CoefficientType>();
}

Expand Down
2 changes: 1 addition & 1 deletion src/storm-parsers/parser/JaniParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class JaniParser {
globalVars(globalVars),
globalFunctions(globalFunctions),
localVars(localVars),
localFunctions(localFunctions){};
localFunctions(localFunctions) {};

Scope(Scope const& other) = default;
std::string description;
Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/BinaryBooleanPathFormula.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class BinaryBooleanPathFormula : public BinaryPathFormula {
BinaryBooleanPathFormula(OperatorType operatorType, std::shared_ptr<Formula const> const& leftSubformula,
std::shared_ptr<Formula const> const& rightSubformula, FormulaContext context = FormulaContext::Probability);

virtual ~BinaryBooleanPathFormula(){
virtual ~BinaryBooleanPathFormula() {
// Intentionally left empty.
};

Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/BinaryBooleanStateFormula.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class BinaryBooleanStateFormula : public BinaryStateFormula {
BinaryBooleanStateFormula(OperatorType operatorType, std::shared_ptr<Formula const> const& leftSubformula,
std::shared_ptr<Formula const> const& rightSubformula);

virtual ~BinaryBooleanStateFormula(){
virtual ~BinaryBooleanStateFormula() {
// Intentionally left empty.
};

Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/Formula.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FormulaInformation;
class Formula : public std::enable_shared_from_this<Formula> {
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.
};

Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/PathFormula.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace storm {
namespace logic {
class PathFormula : public Formula {
public:
virtual ~PathFormula(){
virtual ~PathFormula() {
// Intentionally left empty.
};

Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/StateFormula.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace storm {
namespace logic {
class StateFormula : public Formula {
public:
virtual ~StateFormula(){
virtual ~StateFormula() {
// Intentionally left empty.
};

Expand Down
2 changes: 1 addition & 1 deletion src/storm/logic/UnaryBooleanPathFormula.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class UnaryBooleanPathFormula : public UnaryPathFormula {

UnaryBooleanPathFormula(OperatorType operatorType, std::shared_ptr<Formula const> const& subformula, FormulaContext context = FormulaContext::Probability);

virtual ~UnaryBooleanPathFormula(){
virtual ~UnaryBooleanPathFormula() {
// Intentionally left empty.
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class lexicographicModelCheckerHelper : public helper::SingleValueModelCheckerHe

// init
lexicographicModelCheckerHelper(storm::logic::MultiObjectiveFormula const& formula, storm::storage::SparseMatrix<ValueType> 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
Expand Down
2 changes: 1 addition & 1 deletion src/storm/storage/jani/eliminator/ArrayEliminator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ArrayReplacementsCollectorExpressionVisitor : public storm::expressions::E
typedef typename ArrayEliminatorData::Replacement Replacement;
typedef std::unordered_map<storm::expressions::Variable, Replacement> ReplMap;

ArrayReplacementsCollectorExpressionVisitor(Model& model) : model(model), converged(false), declaringAutomaton(nullptr){};
ArrayReplacementsCollectorExpressionVisitor(Model& model) : model(model), converged(false), declaringAutomaton(nullptr) {};
virtual ~ArrayReplacementsCollectorExpressionVisitor() = default;

/*!
Expand Down

0 comments on commit d61ad71

Please sign in to comment.