Skip to content
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.

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

Replace expansive regex with find #976

Merged
merged 3 commits into from
Dec 20, 2024
Merged
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions src/cpp/benders/benders_core/CriterionInputDataReader.cpp
Original file line number Diff line number Diff line change
@@ -13,14 +13,10 @@ using namespace Benders::Criterion;
CriterionPattern::CriterionPattern(std::string prefix, std::string body)
: prefix_(std::move(prefix)), body_(std::move(body)) {}

/**
* just do
* just cat ;)
*/
std::regex CriterionPattern::MakeRegex() const {
auto pattern = "(^" + prefix_ + "area<" + body_ + ">" + ")";
return std::regex(pattern);
std::string CriterionPattern::Value() const {
return prefix_ + "area<" + body_ + ">";
}

const std::string &CriterionPattern::GetPrefix() const { return prefix_; }
void CriterionPattern::SetPrefix(const std::string &prefix) {
prefix_ = prefix;
17 changes: 9 additions & 8 deletions src/cpp/benders/benders_core/VariablesGroup.cpp
Original file line number Diff line number Diff line change
@@ -25,15 +25,16 @@ std::vector<std::vector<int>> VariablesGroup::Indices() const {

void VariablesGroup::Search() {
indices_.assign(criterion_single_input_data_.size(), {});
int var_index(0);
for (const auto& variable : all_variables_) {
int pattern_index(0);
for (const auto& single_input_data : criterion_single_input_data_) {
if (std::regex_search(variable, single_input_data.Pattern().MakeRegex())) {
int pattern_index(0);
for (const auto& single_input_data : criterion_single_input_data_) {
auto pattern = single_input_data.Pattern().Value();
int var_index(0);
for (const auto& variable : all_variables_) {
if (variable.starts_with(pattern)) {
indices_[pattern_index].push_back(var_index);
}
++pattern_index;
++var_index;
}
++var_index;
++pattern_index;
}
}
}
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ class CriterionPattern {
public:
explicit CriterionPattern(std::string prefix, std::string body);
CriterionPattern() = default;
[[nodiscard]] std::regex MakeRegex() const;
[[nodiscard]] std::string Value() const;
[[nodiscard]] const std::string &GetPrefix() const;
void SetPrefix(const std::string &prefix);
[[nodiscard]] const std::string &GetBody() const;
@@ -54,7 +54,6 @@ class CriterionPattern {
private:
std::string prefix_;
std::string body_;

};

/// @brief holds the pattern and the criterion
18 changes: 9 additions & 9 deletions tests/cpp/outer_loop/outer_loop_test.cpp
Original file line number Diff line number Diff line change
@@ -181,17 +181,17 @@ TEST_F(OuterLoopPatternTest, RegexGivenPrefixAndBody) {
const std::string body = "body";
CriterionPattern o(prefix, body);

auto ret_regex = o.MakeRegex();
auto ret_regex = o.Value();

ASSERT_EQ(std::regex_search(prefix + body, ret_regex), false);
ASSERT_EQ(std::regex_search(prefix + "::" + body + "::suffix", ret_regex),
ASSERT_EQ((prefix + body).find(ret_regex) != std::string::npos, false);
ASSERT_EQ((prefix + "::" + body + "::suffix").find(ret_regex) != std::string::npos,
false);
ASSERT_EQ(std::regex_search(body + prefix, ret_regex), false);
ASSERT_EQ(std::regex_search(prefix + "::", ret_regex), false);
ASSERT_EQ(std::regex_search(body, ret_regex), false);
ASSERT_EQ(std::regex_search(prefix + "area<" + body + ">", ret_regex), true);
ASSERT_EQ(std::regex_search(prefix + "area<" + body + ">::suffix", ret_regex), true);
ASSERT_EQ(std::regex_search(prefix + "area<" + body + "_other_area>::suffix", ret_regex), false);
ASSERT_EQ((body + prefix).find(ret_regex) != std::string::npos , false);
ASSERT_EQ((prefix + "::").find(ret_regex) != std::string::npos, false);
ASSERT_EQ((body).find(ret_regex) != std::string::npos, false);
ASSERT_EQ((prefix + "area<" + body + ">").find(ret_regex) != std::string::npos, true);
ASSERT_EQ((prefix + "area<" + body + ">::suffix").find(ret_regex) != std::string::npos, true); //Match
ASSERT_EQ((prefix + "area<" + body + "_other_area>::suffix").find(ret_regex) != std::string::npos, false);
}

class OuterLoopInputFromYamlTest : public ::testing::Test {};
Loading