diff --git a/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp b/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp index 95bd4c0f568a41ea0712ca97b482f25e37a8bb90..a8a5b058c29a21c08a8ca815dc842b53c1846687 100644 --- a/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp +++ b/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp @@ -45,11 +45,10 @@ automaton::DFA<> ToAutomatonDerivation::convert(const T& regexp) { Qi.push_back(std::set<regexp::RegExp>()); // initialize set Q_i for(const auto& dregexp : Qi.at(i - 1)) { - regexp::RegExpDerivation deriv; for(const auto& a : regexp.getAlphabet()) { string::LinearString < > string(std::vector<alphabet::Symbol>{a}); - regexp::RegExp derived = deriv.derivation(dregexp, string); + regexp::RegExp derived = regexp::RegExpDerivation::derivation(dregexp, string); derived = regexp::simplify::RegExpOptimize::optimize(derived); // this will also add \emptyset as a regexp (and as FA state) @@ -82,11 +81,10 @@ automaton::DFA<> ToAutomatonDerivation::convert(const T& regexp) { automaton.setInputAlphabet(regexp.getAlphabet()); for(const auto& r : Q) { - regexp::RegExpDerivation deriv; for(const auto& a: regexp.getAlphabet()) { string::LinearString < > string(std::vector<alphabet::Symbol>{a}); - regexp::RegExp derived = deriv.derivation(r, string); + regexp::RegExp derived = regexp::RegExpDerivation::derivation(r, string); derived = regexp::simplify::RegExpOptimize::optimize(derived); automaton.addTransition(stateMap.find(r)->second, a, stateMap.find(derived)->second); diff --git a/alib2algo/src/regexp/transform/RegExpIntegral.h b/alib2algo/src/regexp/transform/RegExpIntegral.h index d86b72587244bad5cb222961eb2ac7cdcdf74a18..3a9fa67313d9cd215ae250ef70fe7aa80b805734 100644 --- a/alib2algo/src/regexp/transform/RegExpIntegral.h +++ b/alib2algo/src/regexp/transform/RegExpIntegral.h @@ -26,8 +26,6 @@ namespace regexp { */ class RegExpIntegral : public std::SingleDispatch < RegExpIntegral, regexp::RegExp, const regexp::RegExpBase &, const string::LinearString < >&> { public: - RegExpIntegral() {} - /** * @param regexp RegExp to integrate * @param string String to integrate given RegExp over