From 0c372ac3217ef31607c25266ff4394b5fa1ca2a8 Mon Sep 17 00:00:00 2001
From: mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 3 Jul 2018 05:52:22 +0000
Subject: corrected test units

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3662 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 5b37dde84d00538ff15b7e638ba1f2d6800573c0
---
 src/Persistence_representations/test/kernels.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/Persistence_representations/test/kernels.cpp')

diff --git a/src/Persistence_representations/test/kernels.cpp b/src/Persistence_representations/test/kernels.cpp
index 9db19123..c95e8086 100644
--- a/src/Persistence_representations/test/kernels.cpp
+++ b/src/Persistence_representations/test/kernels.cpp
@@ -29,21 +29,22 @@
 #include <string>
 #include <vector>
 #include <algorithm>  // std::max
+#include <gudhi/Persistence_heat_maps.h>
 #include <gudhi/common_persistence_representations.h>
-#include <gudhi/Weight_functions.h>
-#include <gudhi/Persistence_weighted_gaussian.h>
 #include <gudhi/Sliced_Wasserstein.h>
 #include <gudhi/distance_functions.h>
 #include <gudhi/reader_utils.h>
 
+using constant_scaling_function = Gudhi::Persistence_representations::constant_scaling_function;
 using SW = Gudhi::Persistence_representations::Sliced_Wasserstein;
-using PWG = Gudhi::Persistence_representations::Persistence_weighted_gaussian;
+using PWG = Gudhi::Persistence_representations::Persistence_heat_maps<constant_scaling_function>;
+using Persistence_diagram = std::vector<std::pair<double,double> >;
 
 BOOST_AUTO_TEST_CASE(check_PWG) {
   Persistence_diagram v1, v2; v1.emplace_back(0,1); v2.emplace_back(0,2);
-  PWG pwg1(v1, 1.0, 1000, Gudhi::Persistence_representations::arctan_weight(1,1)); PWG pwgex1(v1, 1.0, -1, Gudhi::Persistence_representations::arctan_weight(1,1));
-  PWG pwg2(v2, 1.0, 1000, Gudhi::Persistence_representations::arctan_weight(1,1)); PWG pwgex2(v2, 1.0, -1, Gudhi::Persistence_representations::arctan_weight(1,1));
-  BOOST_CHECK(std::abs(pwg1.compute_scalar_product(pwg2) - pwgex1.compute_scalar_product(pwgex2)) <= 1e-1);
+  PWG pwg1(v1, Gudhi::Persistence_representations::Gaussian_kernel(1.0));
+  PWG pwg2(v2, Gudhi::Persistence_representations::Gaussian_kernel(1.0));
+  BOOST_CHECK(std::abs(pwg1.compute_scalar_product(pwg2) - std::exp(-0.5)/(std::sqrt(2*Gudhi::Persistence_representations::pi))) <= 1e-3);
 }
 
 BOOST_AUTO_TEST_CASE(check_SW) {
-- 
cgit v1.2.3