Skip to content

Commit

Permalink
Removed '.' when printing rr
Browse files Browse the repository at this point in the history
  • Loading branch information
LuccaT95 committed Dec 10, 2024
1 parent 38de51a commit c726537
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/nso_rr.h
Original file line number Diff line number Diff line change
Expand Up @@ -4364,7 +4364,7 @@ std::ostream& operator<<(std::ostream& stream,
const idni::tau::rr<idni::tau::nso<BAs...>>& f)
{
stream << f.rec_relations;
if (f.main) stream << f.main << '.';
if (f.main) stream << f.main;
return stream;
}

Expand Down
20 changes: 10 additions & 10 deletions tests/integration/test_integration-quantifiers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ using test_case = array<string, 3>;
using test_cases = vector<test_case>;

test_cases ex_cases = {
{ "ex x x=0.", "ex x x = 0.", "T" },
{ "ex x,y xy=0.", "ex x, y xy = 0.", "T" },
{ "ex x ex y xy=0.", "ex x, y xy = 0.", "T" },
{ "ex x x=0.", "ex x x = 0", "T" },
{ "ex x,y xy=0.", "ex x, y xy = 0", "T" },
{ "ex x ex y xy=0.", "ex x, y xy = 0", "T" },
};

test_cases all_cases = {
{ "all x x!=0.", "all x x != 0.", "F" },
{ "all x,y xy!=0.", "all x, y xy != 0.", "F" },
{ "all x all y xy!=0.", "all x, y xy != 0.", "F" },
{ "all x x!=0.", "all x x != 0", "F" },
{ "all x,y xy!=0.", "all x, y xy != 0", "F" },
{ "all x all y xy!=0.", "all x, y xy != 0", "F" },
};

test_cases ex_all_cases = {
{ "ex x all y x=y.", "ex x all y x'y|xy' = 0.", "F" },
{ "ex x all y x=y.", "ex x all y x'y|xy' = 0", "F" },
{ "ex x,y all w,z x=w&&y=z.",
"ex x, y all w, z x'w|xw' = 0 && y'z|yz' = 0.", "F"},
"ex x, y all w, z x'w|xw' = 0 && y'z|yz' = 0", "F"},
};

test_cases all_ex_cases = {
{ "all x ex y x=y.", "all x ex y x'y|xy' = 0.", "T" },
{ "all x ex y x=y.", "all x ex y x'y|xy' = 0", "T" },
{ "all x,y ex w,z x=w && y=z.",
"all x, y ex w, z x'w|xw' = 0 && y'z|yz' = 0.", "T"},
"all x, y ex w, z x'w|xw' = 0 && y'z|yz' = 0", "T"},
};

ostream& operator<<(ostream& os, const test_case& tc) {
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/test_integration-splitter2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TEST_SUITE("Tau_splitter_tau_coeff") {
std::cout << ss.str() << "\n";
#endif

CHECK(ss.str() == "{ o1[t]o2[t] = 0. } : tau ({ o1[t]o2[t] = 0. } : tau v)' = 0");
CHECK(ss.str() == "{ o1[t]o2[t] = 0 } : tau ({ o1[t]o2[t] = 0 } : tau v)' = 0");
}

TEST_CASE("Tau_splitter_tau_coeff2") {
Expand All @@ -67,9 +67,9 @@ TEST_SUITE("Tau_splitter_tau_coeff") {
std::cout << ss.str() << "\n";
#endif

CHECK((ss.str() == "{ o1[t]|o2[t] = 0. } : tau v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0). } : tau = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0. } : tau v = 0 && v{ !(always o2[t] = 0 && o1[t] = 0). } = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0. } v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0). } : tau = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0. } v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0). } = 0"));
CHECK((ss.str() == "{ o1[t]|o2[t] = 0 } : tau v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0) } : tau = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0 } : tau v = 0 && v{ !(always o2[t] = 0 && o1[t] = 0) } = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0 } v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0) } : tau = 0"
|| ss.str() == "{ o1[t]|o2[t] = 0 } v = 0 && v{ !(always o1[t] = 0 && o2[t] = 0) } = 0"));
}
}

0 comments on commit c726537

Please sign in to comment.