diff --git a/tests/core/tests_integration.cpp b/tests/core/tests_integration.cpp index 43abc76f..c0ef3a5e 100644 --- a/tests/core/tests_integration.cpp +++ b/tests/core/tests_integration.cpp @@ -21,7 +21,7 @@ TEST_CASE("Computing tube's primitive", "[core]") for(int i = 0 ; i < 2 ; i++) { Tube tube = tube_test3(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); t_start = clock(); CHECK(ApproxIntv(tube(0)) == Interval(1,3)); @@ -32,7 +32,7 @@ TEST_CASE("Computing tube's primitive", "[core]") t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; Tube tube_primitive = tube.primitive(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); t_start = clock(); CHECK(ApproxIntv(tube_primitive(0)) == Interval(0,3)); @@ -42,8 +42,8 @@ TEST_CASE("Computing tube's primitive", "[core]") CHECK(ApproxIntv(tube_primitive(4)) == Interval(-5,6)); t[i] += (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); - tube_primitive.enable_synthesis(false); + tube.enable_synthesis(SynthesisMode::NONE); + tube_primitive.enable_synthesis(SynthesisMode::NONE); } //if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -55,10 +55,10 @@ TEST_CASE("Computing tube's primitive", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); Tube tube_primitive = tube.primitive(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); CHECK(ApproxIntv(tube_primitive(Interval(0,1))) == Interval(0,2)); CHECK(ApproxIntv(tube_primitive(Interval(1,2))) == Interval(1,4)); @@ -105,8 +105,8 @@ TEST_CASE("Computing tube's primitive", "[core]") CHECK(ApproxIntv(tube_primitive(19+1)) == Interval(11.5,34.5)); CHECK(ApproxIntv(tube_primitive(20+1)) == Interval(12.5,36.5)); - tube.enable_synthesis(false); - tube_primitive.enable_synthesis(false); + tube.enable_synthesis(SynthesisMode::NONE); + tube_primitive.enable_synthesis(SynthesisMode::NONE); } } @@ -116,17 +116,17 @@ TEST_CASE("Computing tube's primitive", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); Tube tube_primitive = tube.primitive(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); CHECK(ApproxIntv(tube_primitive(0)) == Interval(0,8)); CHECK(ApproxIntv(tube_primitive(1)) == Interval(4,15)); CHECK(ApproxIntv(tube_primitive(2)) == Interval(6,21)); - tube.enable_synthesis(false); - tube_primitive.enable_synthesis(false); + tube.enable_synthesis(SynthesisMode::NONE); + tube_primitive.enable_synthesis(SynthesisMode::NONE); } } @@ -135,10 +135,10 @@ TEST_CASE("Computing tube's primitive", "[core]") for(int i = 0 ; i < 2 ; i++) { Tube tube = tube_test4_05(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); Tube tube_primitive = tube.primitive(); - if(i == 0) tube.enable_synthesis(true); + if(i == 0) tube.enable_synthesis(SynthesisMode::BINARY_TREE); CHECK(ApproxIntv(tube_primitive(0)) == Interval(0.0,1)); CHECK(ApproxIntv(tube_primitive(1)) == Interval(0.5,2)); @@ -155,8 +155,8 @@ TEST_CASE("Computing tube's primitive", "[core]") CHECK(ApproxIntv(tube_primitive(12)) == Interval(6.0,13)); CHECK(ApproxIntv(tube_primitive(13)) == Interval(6.5,14)); - tube.enable_synthesis(false); - tube_primitive.enable_synthesis(false); + tube.enable_synthesis(SynthesisMode::NONE); + tube_primitive.enable_synthesis(SynthesisMode::NONE); } } } @@ -167,7 +167,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -189,7 +189,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") CHECK(ApproxIntv(tube.integral(4.0)) == Interval(3,25)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -198,7 +198,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") SECTION("Test tube1(01)") { Tube tube = tube_test_1_01(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -220,7 +220,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") CHECK(ApproxIntv(tube.integral(4.0)) == Interval(3,25)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -230,7 +230,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -257,7 +257,7 @@ TEST_CASE("Computing integration from 0, double argument", "[core]") CHECK(ApproxIntv(tube.integral(14.5)) == Interval(7,23.5)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -270,7 +270,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -301,7 +301,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") CHECK(ApproxIntv(tube.integral(Interval(0,46))) == Interval(-85,194)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -310,7 +310,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") SECTION("Test tube1(01)") { Tube tube = tube_test_1_01(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -341,7 +341,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") CHECK(ApproxIntv(tube.integral(Interval(0,46))) == Interval(-85,194)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -351,7 +351,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -371,7 +371,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") CHECK(ApproxIntv(tube.integral(Interval(9,21))) == Interval(6,36.5)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -381,7 +381,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") { Tube tube = tube_test4_05(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -401,7 +401,7 @@ TEST_CASE("Computing integration from 0, interval argument", "[core]") CHECK(ApproxIntv(tube.integral(Interval(9,21))) == Interval(6,36.5)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -414,7 +414,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -447,7 +447,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(9,21))) == make_pair(Interval(6,13.5), Interval(18,36.5))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -456,7 +456,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") SECTION("Test tube4(05)") { Tube tube = tube_test4_05(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -489,7 +489,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(9,21))) == make_pair(Interval(6,13.5), Interval(18,36.5))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -499,7 +499,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -525,7 +525,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") CHECK(integrale_ub.is_subset(Interval(-16,194))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -534,7 +534,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") SECTION("Test tube1(01)") { Tube tube = tube_test_1_01(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -549,7 +549,7 @@ TEST_CASE("Computing integration from 0, partial integration", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(6.,7.))) == make_pair(Interval(-23,-13), Interval(13,19))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -562,7 +562,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -595,7 +595,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") CHECK(ApproxIntv(tube.integral(Interval(5,10), Interval(31,42))) == Interval(-6,180)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -604,7 +604,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") SECTION("Test tube1(01)") { Tube tube = tube_test_1_01(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -637,7 +637,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") CHECK(ApproxIntv(tube.integral(Interval(5,10), Interval(31,42))) == Interval(-6,180)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -647,7 +647,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -659,7 +659,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") CHECK(ApproxIntv(tube.integral(Interval(0,8), Interval(9,21))) == Interval(-2,36.5)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -668,7 +668,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") SECTION("Test tube4(05)") { Tube tube = tube_test4_05(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -680,7 +680,7 @@ TEST_CASE("Computing integration, two interval bounds", "[core]") CHECK(ApproxIntv(tube.integral(Interval(0,8), Interval(9,21))) == Interval(-2,36.5)); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -693,7 +693,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") { Tube tube = tube_test_1(); tube.set(Interval(-4,2), 14); // to test primitives pre-computation - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -712,7 +712,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(0.), Interval(46.))) == make_pair(Interval(-3), Interval(194))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -721,7 +721,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") SECTION("Test tube1(01)") { Tube tube = tube_test_1_01(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -740,7 +740,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(0.), Interval(46.))) == make_pair(Interval(-3), Interval(194))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -750,7 +750,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") { Tube tube = tube_test4(); tube.set(Interval(-1,1), Interval(10,11)); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -762,7 +762,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(8.6,9.9), Interval(13.2,13.6))) == make_pair(Interval(-3.35,-2.3), Interval(1.95,4.7))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -771,7 +771,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") SECTION("Test tube4(05)") { Tube tube = tube_test4_05(); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis double t[2]; clock_t t_start; @@ -783,7 +783,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") CHECK(ApproxIntvPair(tube.partial_integral(Interval(8.6,9.9), Interval(13.2,13.6))) == make_pair(Interval(-3.35,-2.3), Interval(1.95,4.7))); t[i] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis } if(TEST_COMPUTATION_TIMES) CHECK(COEFF_COMPUTATION_TIME*t[0] < t[1]); @@ -796,7 +796,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") Tube tube(Interval(0.,10.), 0.1, TFunction("sin(t)")); - tube.enable_synthesis(true); // first: testing with tree synthesis + tube.enable_synthesis(SynthesisMode::BINARY_TREE); // first: testing with tree synthesis Interval intv_t = Interval(tube.tdomain().lb() + tube.tdomain().diam() / 4., tube.tdomain().ub() - tube.tdomain().diam() / 4.); intv_t = tube.tdomain(); @@ -805,7 +805,7 @@ TEST_CASE("Computing partial integration, two interval bounds", "[core]") tube.integral(intv_t); t[0] = (double)(clock() - t_start)/CLOCKS_PER_SEC; - tube.enable_synthesis(false); // second: without tree synthesis + tube.enable_synthesis(SynthesisMode::NONE); // second: without tree synthesis t_start = clock(); tube.integral(intv_t);