Skip to content

Commit

Permalink
Fixed identation and PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@eddiebrissow
eddiebrissow committed Mar 5, 2025
1 parent e90a5fa commit 334a48e
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 93 deletions.
4 changes: 2 additions & 2 deletions src/commons/RequestValidator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class RequestValidator {
protected:
string validator_regex;
int count_tokens(const std::string& regex) {
std::regex tokenRegex(R"(\S+)"); // Match non-space sequences
std::sregex_iterator begin(regex.begin(), regex.end(), tokenRegex);
std::regex token_regex(R"(\S+)"); // Match non-space sequences
std::sregex_iterator begin(regex.begin(), regex.end(), token_regex);
std::sregex_iterator end;
return std::distance(begin, end);
}
Expand Down
177 changes: 86 additions & 91 deletions src/inference_agent/inference_request.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,20 @@ std::string InferenceRequest::get_max_proof_length() { return std::to_string(max
std::vector<std::string> InferenceRequest::get_distributed_inference_control_request() {
// clang-format off
std::vector<std::string> tokens = {
"CHAIN", first_handle, second_handle, std::to_string(max_proof_length),
"OR", "LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "IMPLICATION", first_handle,
second_handle, "LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EQUIVALENCE", first_handle,
second_handle};
"CHAIN",
first_handle,
second_handle,
std::to_string(max_proof_length),
"OR",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "IMPLICATION",
first_handle,
second_handle,
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EQUIVALENCE",
first_handle,
second_handle
};
// clang-format on
return tokens;
}
Expand All @@ -50,28 +58,18 @@ ProofOfImplicationOrEquivalence::ProofOfImplicationOrEquivalence(std::string fir
ProofOfImplicationOrEquivalence::~ProofOfImplicationOrEquivalence() {}

std::vector<std::string> ProofOfImplicationOrEquivalence::query() {
std::vector<std::string> tokens = {"LINK_TEMPLATE",
"Expression",
"3",
"NODE",
"Symbol",
"EVALUATION",
"LINK_TEMPLATE",
"Expression",
"2",
"NODE",
"Symbol",
"PREDICATE",
"VARIABLE",
"P",
"LINK_TEMPLATE",
"Expression",
"2",
"NODE",
"Symbol",
"CONCEPT",
"VARIABLE",
"C"};
// clang-format off
std::vector<std::string> tokens = {
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "PREDICATE",
"VARIABLE", "P",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "CONCEPT",
"VARIABLE", "C"
};
// clang-format on
return tokens;
}

Expand Down Expand Up @@ -123,22 +121,20 @@ std::vector<std::string> ProofOfImplicationOrEquivalence::patterns_link_template
std::string ProofOfImplicationOrEquivalence::get_type() { return "PROOF_OF_IMPLICATION_OR_EQUIVALENCE"; }

std::vector<std::vector<std::string>> ProofOfImplicationOrEquivalence::get_requests() {

std::vector<std::vector<std::string>> requests;
std::vector<std::string> query_and_link_creation_template;
// query + link creation template
for (auto token : query()) {
query_and_link_creation_template.push_back(token);
}
for (auto token : patterns_link_template()) {
std::vector<std::string> query_and_link_creation_template(this->query());
for (auto token : this->patterns_link_template()) {
query_and_link_creation_template.push_back(token);
}
requests.push_back(query_and_link_creation_template);

// proof of implication
ProofOfImplication proof_of_implication(first_handle, second_handle, max_proof_length);
for (auto request : proof_of_implication.get_requests()) {
requests.push_back(request);
}

// proof of equivalence
ProofOfEquivalence proof_of_equivalence(first_handle, second_handle, max_proof_length);
for (auto request : proof_of_equivalence.get_requests()) {
requests.push_back(request);
Expand All @@ -157,35 +153,35 @@ ProofOfImplication::~ProofOfImplication() {}
std::vector<std::string> ProofOfImplication::query() {
// clang-format off
std::vector<std::string> tokens = {
"AND", "3",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "SATISFYING_SET",
"VARIABLE", "P1",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "SATISFYING_SET",
"VARIABLE", "P2",
"NOT",
"OR",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "IMPLICATION",
"AND", "3",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "SATISFYING_SET",
"VARIABLE", "P1",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "SATISFYING_SET",
"VARIABLE", "P2",
"NOT",
"OR",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P1",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P2",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "IMPLICATION",
"NODE", "Symbol", "IMPLICATION",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P1",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P2",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P2",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P1",
"VARIABLE", "C"
"NODE", "Symbol", "IMPLICATION",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P2",
"VARIABLE", "C",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P1",
"VARIABLE", "C"
};
// clang-format on
return tokens;
Expand All @@ -210,37 +206,36 @@ ProofOfEquivalence::~ProofOfEquivalence() {}

std::vector<std::string> ProofOfEquivalence::query() {
// clang-format off
std::vector<std::string> tokens =
{
"AND", "3",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "PATTERNS",
"VARIABLE", "C1",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "PATTERNS",
"VARIABLE", "C2",
"NOT",
"OR",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EQUIVALENCE",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C1",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C2",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EQUIVALENCE",
std::vector<std::string> tokens = {
"AND", "3",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "PATTERNS",
"VARIABLE", "C1",
"LINK_TEMPLATE", "Expression", "2",
"NODE", "Symbol", "PATTERNS",
"VARIABLE", "C2",
"NOT",
"OR",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C2",
"NODE", "Symbol", "EQUIVALENCE",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C1",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C2",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C1"
"NODE", "Symbol", "EQUIVALENCE",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C2",
"LINK_TEMPLATE", "Expression", "3",
"NODE", "Symbol", "EVALUATION",
"VARIABLE", "P",
"VARIABLE", "C1"
};
// clang-format on
return tokens;
Expand Down

0 comments on commit 334a48e

Please sign in to comment.