[fplll] 05/08: Remove the test pruner patch : obsolete (upstream improved the code)
Julien Puydt
julien.puydt at laposte.net
Thu Sep 14 05:31:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository fplll.
commit efcb330b525e50d06851db852f16810e15e9841f
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Thu Sep 14 06:52:10 2017 +0200
Remove the test pruner patch : obsolete (upstream improved the code)
---
debian/changelog | 1 +
...s-in-test_pruner-now-tolerates-small-nume.patch | 152 ---------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 153 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2768473..c38e05f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ fplll (5.2.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump std-ver to 4.1.0.
* Bump d/watch to version 4.
+ * Remove the test pruner patch : obsolete (upstream improved the code).
-- Julien Puydt <julien.puydt at laposte.net> Thu, 14 Sep 2017 06:48:31 +0200
diff --git a/debian/patches/0001-Inequalities-in-test_pruner-now-tolerates-small-nume.patch b/debian/patches/0001-Inequalities-in-test_pruner-now-tolerates-small-nume.patch
deleted file mode 100644
index 5aa1c73..0000000
--- a/debian/patches/0001-Inequalities-in-test_pruner-now-tolerates-small-nume.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From ddbc48d3c749ed8c2da51a4366eebd18fcd65730 Mon Sep 17 00:00:00 2001
-From: Leo Ducas <ducas at cwi.nl>
-Date: Wed, 24 May 2017 09:33:34 +0200
-Subject: [PATCH] Inequalities in test_pruner now tolerates small numerical
- errors
-
----
- tests/test_pruner.cpp | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/tests/test_pruner.cpp b/tests/test_pruner.cpp
-index 476f043..0227745 100644
---- a/tests/test_pruner.cpp
-+++ b/tests/test_pruner.cpp
-@@ -337,7 +337,7 @@ template <class FT> int test_auto_prune(size_t n)
- print_status(status);
- status += !(pruning.expectation < 100.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -354,7 +354,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.3, r, PRUNER_METHOD_GRADIENT,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, true);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -368,7 +368,7 @@ template <class FT> int test_auto_prune(size_t n)
-
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -377,7 +377,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.01, r, PRUNER_METHOD_GRADIENT,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, false);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -390,7 +390,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -399,7 +399,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.3, r, PRUNER_METHOD_NM,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, true);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -412,7 +412,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -421,7 +421,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.01, r, PRUNER_METHOD_GRADIENT,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, false);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -434,7 +434,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -443,7 +443,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.3, r, PRUNER_METHOD_HYBRID,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, true);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -456,7 +456,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -465,7 +465,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << "radius " << radius_d << endl;
- prune<FT>(pruning, radius_d, overhead, 0.01, r, PRUNER_METHOD_GRADIENT,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, false);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -478,7 +478,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
-@@ -486,7 +486,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Reprune Hybrid " << endl;
- prune<FT>(pruning, radius_d, overhead, 0.3, r, PRUNER_METHOD_GRADIENT,
- PRUNER_METRIC_PROBABILITY_OF_SHORTEST, false);
-- status += !(pruning.expectation <= 1.0);
-+ status += !(pruning.expectation <= 1.001);
- print_status(status);
- cerr << "Probability " << pruning.expectation << endl;
- cost = 0.;
-@@ -499,7 +499,7 @@ template <class FT> int test_auto_prune(size_t n)
- cerr << endl << "Predicted Total Cost " << cost << endl;
- status += !(pruning.expectation > 0.0);
- print_status(status);
-- status += !(pruning.radius_factor >= 1.0);
-+ status += !(pruning.radius_factor >= .999);
- print_status(status);
- status += !(pruning.coefficients[0] == 1.0);
- print_status(status);
---
-2.13.2
-
diff --git a/debian/patches/series b/debian/patches/series
index e543ce2..104b9a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Inequalities-in-test_pruner-now-tolerates-small-nume.patch
versioned_strategies_path
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fplll.git
More information about the debian-science-commits
mailing list