diff options
Diffstat (limited to 'wasserstein/tests')
-rw-r--r-- | wasserstein/tests/data/test_inf_1_A | 3 | ||||
-rw-r--r-- | wasserstein/tests/data/test_inf_1_B | 4 | ||||
-rw-r--r-- | wasserstein/tests/data/test_inf_2_A | 3 | ||||
-rw-r--r-- | wasserstein/tests/data/test_inf_2_B | 5 | ||||
-rw-r--r-- | wasserstein/tests/data/test_inf_3_A | 6 | ||||
-rw-r--r-- | wasserstein/tests/data/test_inf_3_B | 5 | ||||
-rw-r--r-- | wasserstein/tests/data/test_list.txt | 3 | ||||
-rw-r--r-- | wasserstein/tests/test_hera_wasserstein.cpp | 17 |
8 files changed, 40 insertions, 6 deletions
diff --git a/wasserstein/tests/data/test_inf_1_A b/wasserstein/tests/data/test_inf_1_A new file mode 100644 index 0000000..c773f02 --- /dev/null +++ b/wasserstein/tests/data/test_inf_1_A @@ -0,0 +1,3 @@ +-inf inf +-inf inf +2 1 diff --git a/wasserstein/tests/data/test_inf_1_B b/wasserstein/tests/data/test_inf_1_B new file mode 100644 index 0000000..a55e496 --- /dev/null +++ b/wasserstein/tests/data/test_inf_1_B @@ -0,0 +1,4 @@ +-inf inf +-inf inf +inf inf +4 9 diff --git a/wasserstein/tests/data/test_inf_2_A b/wasserstein/tests/data/test_inf_2_A new file mode 100644 index 0000000..c773f02 --- /dev/null +++ b/wasserstein/tests/data/test_inf_2_A @@ -0,0 +1,3 @@ +-inf inf +-inf inf +2 1 diff --git a/wasserstein/tests/data/test_inf_2_B b/wasserstein/tests/data/test_inf_2_B new file mode 100644 index 0000000..6d7e751 --- /dev/null +++ b/wasserstein/tests/data/test_inf_2_B @@ -0,0 +1,5 @@ +-inf inf +-inf inf +inf -inf +inf inf +4 9 diff --git a/wasserstein/tests/data/test_inf_3_A b/wasserstein/tests/data/test_inf_3_A new file mode 100644 index 0000000..4f3fc2f --- /dev/null +++ b/wasserstein/tests/data/test_inf_3_A @@ -0,0 +1,6 @@ +-inf inf +-inf inf +inf -inf +-inf -inf +-inf -inf +2 1 diff --git a/wasserstein/tests/data/test_inf_3_B b/wasserstein/tests/data/test_inf_3_B new file mode 100644 index 0000000..6d7e751 --- /dev/null +++ b/wasserstein/tests/data/test_inf_3_B @@ -0,0 +1,5 @@ +-inf inf +-inf inf +inf -inf +inf inf +4 9 diff --git a/wasserstein/tests/data/test_list.txt b/wasserstein/tests/data/test_list.txt index 27340d8..b1ba6ed 100644 --- a/wasserstein/tests/data/test_list.txt +++ b/wasserstein/tests/data/test_list.txt @@ -19,3 +19,6 @@ test_100_A test_100_B 3.0 2.0 2.09695346034248 test_diag1_A test_diag1_B 1.0 -1.0 0.0 test_diag2_A test_diag2_B 1.0 -1.0 0.0 test_diag3_A test_diag3_B 1.0 -1.0 0.0 +test_inf_1_A test_inf_1_B 1.0 -1.0 3.0 +test_inf_2_A test_inf_2_B 1.0 -1.0 inf +test_inf_3_A test_inf_3_B 1.0 -1.0 3.0 diff --git a/wasserstein/tests/test_hera_wasserstein.cpp b/wasserstein/tests/test_hera_wasserstein.cpp index 0a80d2f..621dd5a 100644 --- a/wasserstein/tests/test_hera_wasserstein.cpp +++ b/wasserstein/tests/test_hera_wasserstein.cpp @@ -130,9 +130,14 @@ TEST_CASE("file cases", "wasserstein_dist") SECTION("from file:") { - const char* file_name = "../tests/data/test_list.txt"; + const char* file_name = "test_list.txt"; std::ifstream f; f.open(file_name); + if (!f.good()) { + std::cerr << "Must run from tests/data" << std::endl; + REQUIRE(false); + } + std::vector<TestFromFileCase> test_params; std::string s; while (std::getline(f, s)) { @@ -147,13 +152,13 @@ TEST_CASE("file cases", "wasserstein_dist") REQUIRE( read_file_A ); REQUIRE( read_file_B ); double hera_answer = hera::wasserstein_dist(diagram_A, diagram_B, params); - REQUIRE( fabs(hera_answer - ts.answer) <= 0.01 * hera_answer ); - std::cout << ts << " PASSED " << std::endl; + bool is_correct = (hera_answer == ts.answer) || (fabs(hera_answer - ts.answer) <= 0.01 * hera_answer); + REQUIRE(is_correct); } } SECTION("from DIPHA file:") { - const char* file_name = "../tests/data/test_list.txt"; + const char* file_name = "test_list.txt"; std::ifstream f; f.open(file_name); std::vector<TestFromFileCase> test_params; @@ -167,8 +172,8 @@ TEST_CASE("file cases", "wasserstein_dist") params.internal_p = ts.internal_p; bool read_file_A = hera::read_diagram_dipha<double, PairVector>(ts.file_1 + std::string(".pd.dipha"), 1, diagram_A); bool read_file_B = hera::read_diagram_dipha<double, PairVector>(ts.file_2 + std::string(".pd.dipha"), 1, diagram_B); - REQUIRE( read_file_A ); - REQUIRE( read_file_B ); + if (!read_file_A) + continue; double hera_answer = hera::wasserstein_dist(diagram_A, diagram_B, params); REQUIRE( fabs(hera_answer - ts.answer) <= 0.01 * hera_answer ); std::cout << ts << " PASSED " << std::endl; |