summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gard.spreemann@epfl.ch>2018-03-16 10:56:37 +0100
committerGard Spreemann <gard.spreemann@epfl.ch>2018-03-16 10:56:37 +0100
commitf2cd56133457211356d2e9a485519723872d217b (patch)
treeb06ea553c6156b0e755fac4f856db57861e8f06d
parentbcdf9e795ae5c75c87f5b667b5fc9a0e59e31030 (diff)
Test cases for the DIPHA input reader.gspr/new-dipha-input
-rw-r--r--geom_matching/wasserstein/tests/data/test_100_A.pd.diphabin0 -> 2424 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_100_B.pd.diphabin0 -> 2424 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_5_A.pd.diphabin0 -> 144 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_5_B.pd.diphabin0 -> 144 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag1_A.pd.diphabin0 -> 48 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag1_B.pd.diphabin0 -> 48 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag2_A.pd.diphabin0 -> 48 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag2_B.pd.diphabin0 -> 48 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag3_A.pd.diphabin0 -> 5304 bytes
-rw-r--r--geom_matching/wasserstein/tests/data/test_diag3_B.pd.diphabin0 -> 4656 bytes
-rw-r--r--geom_matching/wasserstein/tests/test_hera_wasserstein.cpp23
11 files changed, 23 insertions, 0 deletions
diff --git a/geom_matching/wasserstein/tests/data/test_100_A.pd.dipha b/geom_matching/wasserstein/tests/data/test_100_A.pd.dipha
new file mode 100644
index 0000000..e94f5fe
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_100_A.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_100_B.pd.dipha b/geom_matching/wasserstein/tests/data/test_100_B.pd.dipha
new file mode 100644
index 0000000..25d6734
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_100_B.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_5_A.pd.dipha b/geom_matching/wasserstein/tests/data/test_5_A.pd.dipha
new file mode 100644
index 0000000..be84441
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_5_A.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_5_B.pd.dipha b/geom_matching/wasserstein/tests/data/test_5_B.pd.dipha
new file mode 100644
index 0000000..14ca67c
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_5_B.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag1_A.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag1_A.pd.dipha
new file mode 100644
index 0000000..fa4a4d9
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag1_A.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag1_B.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag1_B.pd.dipha
new file mode 100644
index 0000000..621a55f
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag1_B.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag2_A.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag2_A.pd.dipha
new file mode 100644
index 0000000..621a55f
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag2_A.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag2_B.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag2_B.pd.dipha
new file mode 100644
index 0000000..621a55f
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag2_B.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag3_A.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag3_A.pd.dipha
new file mode 100644
index 0000000..0dbfb89
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag3_A.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/data/test_diag3_B.pd.dipha b/geom_matching/wasserstein/tests/data/test_diag3_B.pd.dipha
new file mode 100644
index 0000000..3fbfd90
--- /dev/null
+++ b/geom_matching/wasserstein/tests/data/test_diag3_B.pd.dipha
Binary files differ
diff --git a/geom_matching/wasserstein/tests/test_hera_wasserstein.cpp b/geom_matching/wasserstein/tests/test_hera_wasserstein.cpp
index a1a257b..3d5db5f 100644
--- a/geom_matching/wasserstein/tests/test_hera_wasserstein.cpp
+++ b/geom_matching/wasserstein/tests/test_hera_wasserstein.cpp
@@ -200,6 +200,29 @@ TEST_CASE("file cases", "wasserstein_dist")
std::cout << ts << " PASSED " << std::endl;
}
}
+
+ SECTION("from DIPHA file:") {
+ const char* file_name = "../tests/data/test_list.txt";
+ std::ifstream f;
+ f.open(file_name);
+ std::vector<TestFromFileCase> test_params;
+ std::string s;
+ while (std::getline(f, s)) {
+ test_params.emplace_back(s);
+ }
+
+ for(const auto& ts : test_params) {
+ params.wasserstein_power = ts.q;
+ 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 );
+ 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;
+ }
+ }
}