[eigen3] 02/06: Remove applied patches.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository eigen3.

commit fea95914832c520721244f7053718da8af081686
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Feb 27 16:18:48 2014 +0100

    Remove applied patches.
---
 .../patches/port_ConstrainedConjGrad_eigen3.patch  | 41 ---------------
 debian/patches/removeBVH_example.patch             | 58 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 101 deletions(-)

diff --git a/debian/patches/port_ConstrainedConjGrad_eigen3.patch b/debian/patches/port_ConstrainedConjGrad_eigen3.patch
deleted file mode 100644
index b643cb4..0000000
--- a/debian/patches/port_ConstrainedConjGrad_eigen3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Port unsupported constrained CG to Eigen3
-Author: Anton Gladky <gladk at debian.org>
-Applied-Upstream: https://bitbucket.org/eigen/eigen/commits/387c04265505096fb9051d9c10408a3700c258ae
-Last-Update: 2014-01-15
-
---- eigen3-3.2.0.orig/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
-+++ eigen3-3.2.0/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
-@@ -58,7 +58,9 @@ void pseudo_inverse(const CMatrix &C, CI
-   Scalar rho, rho_1, alpha;
-   d.setZero();
- 
--  CINV.startFill(); // FIXME estimate the number of non-zeros
-+  typedef Triplet<double> T;
-+  std::vector<T> tripletList;
-+    
-   for (Index i = 0; i < rows; ++i)
-   {
-     d[i] = 1.0;
-@@ -84,11 +86,12 @@ void pseudo_inverse(const CMatrix &C, CI
-     // FIXME add a generic "prune/filter" expression for both dense and sparse object to sparse
-     for (Index j=0; j<l.size(); ++j)
-       if (l[j]<1e-15)
--        CINV.fill(i,j) = l[j];
-+	tripletList.push_back(T(i,j,l(j)));
- 
-+	
-     d[i] = 0.0;
-   }
--  CINV.endFill();
-+  CINV.setFromTriplets(tripletList.begin(), tripletList.end());
- }
- 
- 
-@@ -103,6 +106,7 @@ template<typename TMatrix, typename CMat
- void constrained_cg(const TMatrix& A, const CMatrix& C, VectorX& x,
-                        const VectorB& b, const VectorF& f, IterationController &iter)
- {
-+  using std::sqrt;
-   typedef typename TMatrix::Scalar Scalar;
-   typedef typename TMatrix::Index Index;
-   typedef Matrix<Scalar,Dynamic,1>  TmpVec;
diff --git a/debian/patches/removeBVH_example.patch b/debian/patches/removeBVH_example.patch
deleted file mode 100644
index 0a5318a..0000000
--- a/debian/patches/removeBVH_example.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Disable unsupported BVH_example (segfault)
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-11-09
-
---- a/unsupported/doc/examples/BVH_Example.cpp
-+++ b/unsupported/doc/examples/BVH_Example.cpp
-@@ -2,51 +2,7 @@
- #include <unsupported/Eigen/BVH>
- #include <iostream>
- 
--using namespace Eigen;
--typedef AlignedBox<double, 2> Box2d;
--
--namespace Eigen {
--    namespace internal {
--        Box2d bounding_box(const Vector2d &v) { return Box2d(v, v); } //compute the bounding box of a single point
--    }
--}
--
--struct PointPointMinimizer //how to compute squared distances between points and rectangles
--{
--  PointPointMinimizer() : calls(0) {}
--  typedef double Scalar;
--
--  double minimumOnVolumeVolume(const Box2d &r1, const Box2d &r2) { ++calls; return r1.squaredExteriorDistance(r2); }
--  double minimumOnVolumeObject(const Box2d &r, const Vector2d &v) { ++calls; return r.squaredExteriorDistance(v); }
--  double minimumOnObjectVolume(const Vector2d &v, const Box2d &r) { ++calls; return r.squaredExteriorDistance(v); }
--  double minimumOnObjectObject(const Vector2d &v1, const Vector2d &v2) { ++calls; return (v1 - v2).squaredNorm(); }
--
--  int calls;
--};
--
- int main()
- {
--  typedef std::vector<Vector2d, aligned_allocator<Vector2d> > StdVectorOfVector2d;
--  StdVectorOfVector2d redPoints, bluePoints;
--  for(int i = 0; i < 100; ++i) { //initialize random set of red points and blue points
--    redPoints.push_back(Vector2d::Random());
--    bluePoints.push_back(Vector2d::Random());
--  }
--
--  PointPointMinimizer minimizer;
--  double minDistSq = std::numeric_limits<double>::max();
--
--  //brute force to find closest red-blue pair
--  for(int i = 0; i < (int)redPoints.size(); ++i)
--    for(int j = 0; j < (int)bluePoints.size(); ++j)
--      minDistSq = std::min(minDistSq, minimizer.minimumOnObjectObject(redPoints[i], bluePoints[j]));
--  std::cout << "Brute force distance = " << sqrt(minDistSq) << ", calls = " << minimizer.calls << std::endl;
--
--  //using BVH to find closest red-blue pair
--  minimizer.calls = 0;
--  KdBVH<double, 2, Vector2d> redTree(redPoints.begin(), redPoints.end()), blueTree(bluePoints.begin(), bluePoints.end()); //construct the trees
--  minDistSq = BVMinimize(redTree, blueTree, minimizer); //actual BVH minimization call
--  std::cout << "BVH distance         = " << sqrt(minDistSq) << ", calls = " << minimizer.calls << std::endl;
--
-   return 0;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 2d423d1..68f8bd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-removeBVH_example.patch
 installFindEigen3.patch
-port_ConstrainedConjGrad_eigen3.patch
 remove_buildtype_check.patch
 fix_spline_module.patch
 remove_piwik.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git