Add tests of PFDTane algorithm

iliya-b · Sep 16, 2024 · 646bc0f · 646bc0f
1 parent c5a46b9
commit 646bc0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/tests/test_fd_algorithm.cpp b/src/tests/test_fd_algorithm.cpp
@@ -9,8 +9,8 @@
 #include "algorithms/fd/fdep/fdep.h"
 #include "algorithms/fd/fun/fun.h"
 #include "algorithms/fd/hyfd/hyfd.h"
-#include "algorithms/fd/pfdtane/pfdtane.h"
 #include "algorithms/fd/pyro/pyro.h"
+#include "algorithms/fd/tane/pfdtane.h"
 #include "algorithms/fd/tane/tane.h"
 #include "model/table/relational_schema.h"
 #include "test_fd_util.h"

diff --git a/src/tests/test_fd_mine.cpp b/src/tests/test_fd_mine.cpp
@@ -7,6 +7,7 @@
 #include "algorithms/algo_factory.h"
 #include "algorithms/fd/fd_mine/fd_mine.h"
 #include "algorithms/fd/pyro/pyro.h"
+#include "algorithms/fd/tane/pfdtane.h"
 #include "algorithms/fd/tane/tane.h"
 #include "config/error/type.h"
 #include "config/names.h"

diff --git a/src/tests/test_pfdtane.cpp b/src/tests/test_pfdtane.cpp
@@ -3,8 +3,7 @@
 #include "algo_factory.h"
 #include "all_csv_configs.h"
 #include "config/names.h"
-#include "fd/pfdtane/enums.h"
-#include "fd/pfdtane/pfdtane.h"
+#include "fd/tane/pfdtane.h"
 #include "model/table/column_layout_relation_data.h"
 #include "parser/csv_parser/csv_parser.h"
 
@@ -51,11 +50,12 @@ TEST_P(TestPFDTaneValidation, ErrorCalculationTest) {
     double eps = 0.00001;
     auto table = std::make_shared<CSVParser>(p.csv_config);
     auto relation = ColumnLayoutRelationData::CreateFrom(*table, true);
+
     for (auto const& [lhs_id, rhs_id, expected_error] : p.fds) {
         auto const& lhs = relation->GetColumnData(lhs_id).GetPositionListIndex();
         auto const& rhs = relation->GetColumnData(rhs_id).GetPositionListIndex();
         config::ErrorType error =
-                algos::PFDTane::CalculateFdError(lhs, lhs->Intersect(rhs).get(), p.error_measure);
+                algos::PFDTane::CalculatePFDError(lhs, lhs->Intersect(rhs).get(), p.error_measure);
         EXPECT_NEAR(error, expected_error, eps);
     }
 }
@@ -64,7 +64,11 @@ TEST_P(TestPFDTaneValidation, ErrorCalculationTest) {
 INSTANTIATE_TEST_SUITE_P(
         PFDTaneTestMiningSuite, TestPFDTaneMining,
         ::testing::Values(
-            PFDTaneMiningParams(44381, 0.3, +algos::ErrorMeasure::per_value, kTestFD)
+            PFDTaneMiningParams(44381, 0.3, +algos::ErrorMeasure::per_value, kTestFD),
+            PFDTaneMiningParams(39491, 0.1, +algos::ErrorMeasure::per_value, kIris),
+            PFDTaneMiningParams(10695, 0.01, +algos::ErrorMeasure::per_value, kIris),
+            PFDTaneMiningParams(7893, 0.1, +algos::ErrorMeasure::per_value, kNeighbors10k),
+            PFDTaneMiningParams(41837, 0.01, +algos::ErrorMeasure::per_value, kNeighbors10k)
         ));
 
 INSTANTIATE_TEST_SUITE_P(