Attachment #199 for bug #218

This bugzilla service is closed. All entries have been migrated to https://gitlab.com/libeigen/eigen

View | Details | Raw Unified | Return to bug 218
Collapse All | Expand All

Lines 97-103 Link Here

(-)a/Eigen/src/Core/CwiseUnaryView.h (-1 / +1 lines)
97		97
98	protected:	98	protected:
99	// FIXME changed from MatrixType::Nested because of a weird compilation error with sun CC	99	// FIXME changed from MatrixType::Nested because of a weird compilation error with sun CC
100	const typename internal::nested<MatrixType>::type m_matrix;	100	typename internal::nested<MatrixType>::type m_matrix;
101	ViewOp m_functor;	101	ViewOp m_functor;
102	};	102	};
103		103

Lines 35-42 Link Here

(-)a/Eigen/src/Core/Fuzzy.h (-2 / +2 lines)
35	static bool run(const Derived& x, const OtherDerived& y, typename Derived::RealScalar prec)	35	static bool run(const Derived& x, const OtherDerived& y, typename Derived::RealScalar prec)
36	{	36	{
37	using std::min;	37	using std::min;
38	const typename internal::nested<Derived,2>::type nested(x);	38	typename internal::nested<Derived,2>::type nested(x);
39	const typename internal::nested<OtherDerived,2>::type otherNested(y);	39	typename internal::nested<OtherDerived,2>::type otherNested(y);
40	return (nested - otherNested).cwiseAbs2().sum() <= prec * prec * (min)(nested.cwiseAbs2().sum(), otherNested.cwiseAbs2().sum());	40	return (nested - otherNested).cwiseAbs2().sum() <= prec * prec * (min)(nested.cwiseAbs2().sum(), otherNested.cwiseAbs2().sum());
41	}	41	}
42	};	42	};

Lines 55-61 Link Here

(-)a/Eigen/src/Core/ReturnByValue.h (-1 / +1 lines)
55	template<typename Derived,int n,typename PlainObject>	55	template<typename Derived,int n,typename PlainObject>
56	struct nested<ReturnByValue<Derived>, n, PlainObject>	56	struct nested<ReturnByValue<Derived>, n, PlainObject>
57	{	57	{
58	typedef typename traits<Derived>::ReturnType type;	58	typedef typename traits<Derived>::ReturnType const type;
59	};	59	};
60		60
61	} // end namespace internal	61	} // end namespace internal




  template<typename Derived>
  inline explicit AlignedBox(const MatrixBase<Derived>& a_p)
  {
    typename internal::nested<Derived,2>::type p(a_p.derived());
    m_min = p;
    m_max = p;
  }

  template<typename Derived>
  inline bool contains(const MatrixBase<Derived>& a_p) const
  {
    typename internal::nested<Derived,2>::type p(a_p.derived());
    return (m_min.array()<=p.array()).all() && (p.array()<=m_max.array()).all();
  }


  template<typename Derived>
  inline AlignedBox& extend(const MatrixBase<Derived>& a_p)
  {
    typename internal::nested<Derived,2>::type p(a_p.derived());
    m_min = m_min.cwiseMin(p);
    m_max = m_max.cwiseMax(p);
    return *this;

  template<typename Derived>
  inline AlignedBox& translate(const MatrixBase<Derived>& a_t)
  {
    typename internal::nested<Derived,2>::type t(a_t.derived());
    m_min += t;
    m_max += t;
    return *this;

template<typename Derived>
inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const
{
  typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived());
  Scalar dist2 = 0.;
  Scalar aux;
  for (Index k=0; k<dim(); ++k)

Lines 43-50 Link Here

(-)a/Eigen/src/Geometry/OrthoMethods.h (-2 / +2 lines)
43		43
44	// Note that there is no need for an expression here since the compiler	44	// Note that there is no need for an expression here since the compiler
45	// optimize such a small temporary very well (even within a complex expression)	45	// optimize such a small temporary very well (even within a complex expression)
46	const typename internal::nested<Derived,2>::type lhs(derived());	46	typename internal::nested<Derived,2>::type lhs(derived());
47	const typename internal::nested<OtherDerived,2>::type rhs(other.derived());	47	typename internal::nested<OtherDerived,2>::type rhs(other.derived());
48	return typename cross_product_return_type<OtherDerived>::type(	48	return typename cross_product_return_type<OtherDerived>::type(
49	internal::conj(lhs.coeff(1) * rhs.coeff(2) - lhs.coeff(2) * rhs.coeff(1)),	49	internal::conj(lhs.coeff(1) * rhs.coeff(2) - lhs.coeff(2) * rhs.coeff(1)),
50	internal::conj(lhs.coeff(2) * rhs.coeff(0) - lhs.coeff(0) * rhs.coeff(2)),	50	internal::conj(lhs.coeff(2) * rhs.coeff(0) - lhs.coeff(0) * rhs.coeff(2)),

Lines 32-39 Link Here

(-)a/Eigen/src/Sparse/SparseFuzzy.h (-2 / +2 lines)
32	// typename NumTraits<Scalar>::Real prec	32	// typename NumTraits<Scalar>::Real prec
33	// ) const	33	// ) const
34	// {	34	// {
35	// const typename internal::nested<Derived,2>::type nested(derived());	35	// typename internal::nested<Derived,2>::type nested(derived());
36	// const typename internal::nested<OtherDerived,2>::type otherNested(other.derived());	36	// typename internal::nested<OtherDerived,2>::type otherNested(other.derived());
37	// return (nested - otherNested).cwise().abs2().sum()	37	// return (nested - otherNested).cwise().abs2().sum()
38	// <= prec * prec * (std::min)(nested.cwise().abs2().sum(), otherNested.cwise().abs2().sum());	38	// <= prec * prec * (std::min)(nested.cwise().abs2().sum(), otherNested.cwise().abs2().sum());
39	// }	39	// }

Lines 38-48 Link Here

(-)a/Eigen/src/Sparse/SparseProduct.h (-2 / +2 lines)
38		38
39	typedef typename internal::conditional<TransposeLhs,	39	typedef typename internal::conditional<TransposeLhs,
40	SparseMatrix<Scalar,0>,	40	SparseMatrix<Scalar,0>,
41	const typename internal::nested<Lhs,Rhs::RowsAtCompileTime>::type>::type LhsNested;	41	typename internal::nested<Lhs,Rhs::RowsAtCompileTime>::type>::type LhsNested;
42		42
43	typedef typename internal::conditional<TransposeRhs,	43	typedef typename internal::conditional<TransposeRhs,
44	SparseMatrix<Scalar,0>,	44	SparseMatrix<Scalar,0>,
45	const typename internal::nested<Rhs,Lhs::RowsAtCompileTime>::type>::type RhsNested;	45	typename internal::nested<Rhs,Lhs::RowsAtCompileTime>::type>::type RhsNested;
46		46
47	typedef SparseSparseProduct<LhsNested, RhsNested> Type;	47	typedef SparseSparseProduct<LhsNested, RhsNested> Type;
48	};	48	};

Lines 27-34 Link Here

(-)a/unsupported/Eigen/src/Skyline/SkylineProduct.h (-2 / +2 lines)
27		27
28	template<typename Lhs, typename Rhs, int ProductMode>	28	template<typename Lhs, typename Rhs, int ProductMode>
29	struct SkylineProductReturnType {	29	struct SkylineProductReturnType {
30	typedef const typename internal::nested<Lhs, Rhs::RowsAtCompileTime>::type LhsNested;	30	typedef typename internal::nested<Lhs, Rhs::RowsAtCompileTime>::type LhsNested;
31	typedef const typename internal::nested<Rhs, Lhs::RowsAtCompileTime>::type RhsNested;	31	typedef typename internal::nested<Rhs, Lhs::RowsAtCompileTime>::type RhsNested;
32		32
33	typedef SkylineProduct<LhsNested, RhsNested, ProductMode> Type;	33	typedef SkylineProduct<LhsNested, RhsNested, ProductMode> Type;
34	};	34	};

Return to bug 218

Lines 84-90 Link Here

(-)a/Eigen/src/Geometry/AlignedBox.h (-5 / +5 lines)
84	template<typename Derived>	84	template<typename Derived>
85	inline explicit AlignedBox(const MatrixBase<Derived>& a_p)	85	inline explicit AlignedBox(const MatrixBase<Derived>& a_p)
86	{	86	{
87	const typename internal::nested<Derived,2>::type p(a_p.derived());	87	typename internal::nested<Derived,2>::type p(a_p.derived());
88	m_min = p;	88	m_min = p;
89	m_max = p;	89	m_max = p;
90	}	90	}
Lines 190-196 Link Here
190	template<typename Derived>	190	template<typename Derived>
191	inline bool contains(const MatrixBase<Derived>& a_p) const	191	inline bool contains(const MatrixBase<Derived>& a_p) const
192	{	192	{
193	const typename internal::nested<Derived,2>::type p(a_p.derived());	193	typename internal::nested<Derived,2>::type p(a_p.derived());
194	return (m_min.array()<=p.array()).all() && (p.array()<=m_max.array()).all();	194	return (m_min.array()<=p.array()).all() && (p.array()<=m_max.array()).all();
195	}	195	}
196		196
Lines 202-208 Link Here
202	template<typename Derived>	202	template<typename Derived>
203	inline AlignedBox& extend(const MatrixBase<Derived>& a_p)	203	inline AlignedBox& extend(const MatrixBase<Derived>& a_p)
204	{	204	{
205	const typename internal::nested<Derived,2>::type p(a_p.derived());	205	typename internal::nested<Derived,2>::type p(a_p.derived());
206	m_min = m_min.cwiseMin(p);	206	m_min = m_min.cwiseMin(p);
207	m_max = m_max.cwiseMax(p);	207	m_max = m_max.cwiseMax(p);
208	return *this;	208	return *this;
Lines 236-242 Link Here
236	template<typename Derived>	236	template<typename Derived>
237	inline AlignedBox& translate(const MatrixBase<Derived>& a_t)	237	inline AlignedBox& translate(const MatrixBase<Derived>& a_t)
238	{	238	{
239	const typename internal::nested<Derived,2>::type t(a_t.derived());	239	typename internal::nested<Derived,2>::type t(a_t.derived());
240	m_min += t;	240	m_min += t;
241	m_max += t;	241	m_max += t;
242	return *this;	242	return *this;
Lines 309-315 Link Here
309	template<typename Derived>	309	template<typename Derived>
310	inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const	310	inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const
311	{	311	{
312	const typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived());	312	typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived());
313	Scalar dist2 = 0.;	313	Scalar dist2 = 0.;
314	Scalar aux;	314	Scalar aux;
315	for (Index k=0; k<dim(); ++k)	315	for (Index k=0; k<dim(); ++k)