diff --git a/include/mata/parser/bdd-domain.hh b/include/mata/parser/bdd-domain.hh index fde942fe3..fba4ff181 100644 --- a/include/mata/parser/bdd-domain.hh +++ b/include/mata/parser/bdd-domain.hh @@ -51,9 +51,9 @@ namespace mata { return val.IsZero(); } - BDDDomain getTrue() const; - BDDDomain getFalse() const; - BDDDomain getVar() const; + BDDDomain get_true() const; + BDDDomain get_false() const; + BDDDomain get_var() const; }; } diff --git a/include/mata/parser/mintermization.hh b/include/mata/parser/mintermization.hh index 916cfa28f..142f3a11b 100644 --- a/include/mata/parser/mintermization.hh +++ b/include/mata/parser/mintermization.hh @@ -93,16 +93,16 @@ private: // private data members public: /** - * Takes a set of BDDs and build a minterm tree over it. - * The leaves of BDDs, which are minterms of input set, are returned - * @param source_bdds BDDs for which minterms are computed + * Takes a set of domain values and build a minterm tree over it. + * The leaves of domain values, which are minterms of input set, are returned + * @param domain_values domain values for which minterms are computed * @return Computed minterms */ std::unordered_set compute_minterms( - const std::unordered_set& source_bdds) + const std::unordered_set& domain_values) { - std::unordered_set stack{ domain_base.getTrue() }; - for (const MintermizationDomain& b: source_bdds) { + std::unordered_set stack{ domain_base.get_true() }; + for (const MintermizationDomain& b: domain_values) { std::unordered_set next; /** * TODO: Possible optimization - we can remember which transition belongs to the currently processed vars @@ -137,9 +137,9 @@ public: if (symbol_to_var.count(node.name)) { return symbol_to_var.at(node.name); } else { - MintermizationDomain res = (node.is_true()) ? domain_base.getTrue() : - (node.is_false() ? domain_base.getFalse() : - domain_base.getVar()); + MintermizationDomain res = (node.is_true()) ? domain_base.get_true() : + (node.is_false() ? domain_base.get_false() : + domain_base.get_var()); symbol_to_var.insert(std::make_pair(node.name, res)); return res; } @@ -173,7 +173,7 @@ public: * @return Mintermized automaton */ mata::IntermediateAut mintermize(const mata::IntermediateAut& aut) { - return mintermize(std::vector{&aut})[0]; + return mintermize(std::vector{&aut}).front(); } /** diff --git a/src/bdd-domain.cc b/src/bdd-domain.cc index 910020d66..d9e51a41a 100644 --- a/src/bdd-domain.cc +++ b/src/bdd-domain.cc @@ -16,14 +16,14 @@ #include "mata/parser/bdd-domain.hh" -struct mata::BDDDomain mata::BDDDomain::getTrue() const { +struct mata::BDDDomain mata::BDDDomain::get_true() const { return BDDDomain(bdd_mng, bdd_mng.bddOne()); } -struct mata::BDDDomain mata::BDDDomain::getFalse() const { +struct mata::BDDDomain mata::BDDDomain::get_false() const { return BDDDomain(bdd_mng, bdd_mng.bddZero()); } -struct mata::BDDDomain mata::BDDDomain::getVar() const { +struct mata::BDDDomain mata::BDDDomain::get_var() const { return BDDDomain(bdd_mng, bdd_mng.bddVar()); }