diff --git a/src/nso_rr.h b/src/nso_rr.h index 6d0ac70..42e87c4 100644 --- a/src/nso_rr.h +++ b/src/nso_rr.h @@ -4364,7 +4364,7 @@ std::ostream& operator<<(std::ostream& stream, const idni::tau::rr>& f) { stream << f.rec_relations; - if (f.main) stream << f.main << '.'; + if (f.main) stream << f.main; return stream; } diff --git a/tests/integration/test_integration-quantifiers.cpp b/tests/integration/test_integration-quantifiers.cpp index 545f393..90c6f8f 100644 --- a/tests/integration/test_integration-quantifiers.cpp +++ b/tests/integration/test_integration-quantifiers.cpp @@ -22,27 +22,27 @@ using test_case = array; using test_cases = vector; 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) { diff --git a/tests/integration/test_integration-splitter2.cpp b/tests/integration/test_integration-splitter2.cpp index c1f6f8a..8e83a50 100644 --- a/tests/integration/test_integration-splitter2.cpp +++ b/tests/integration/test_integration-splitter2.cpp @@ -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") { @@ -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")); } }