lots more EIGEN2_SUPPORT fixes. Now several of the most important core tests build and succeed.

This commit is contained in:
Benoit Jacob
2011-01-20 10:36:32 -05:00
parent 66a2ffa9bd
commit 34d93686db
12 changed files with 134 additions and 47 deletions

View File

@@ -25,13 +25,8 @@
#ifndef EIGEN2_MACROS_H
#define EIGEN2_MACROS_H
#ifndef ei_assert
#define ei_assert eigen_assert
#endif
#ifndef ei_internal_assert
#define ei_internal_assert eigen_internal_assert
#endif
#define ei_assert eigen_assert
#define ei_internal_assert eigen_internal_assert
#define EIGEN_ALIGN_128 EIGEN_ALIGN16

View File

@@ -40,6 +40,9 @@ template<typename T> inline T ei_pow (const T& x,const T& y) { return internal::
template<typename T> inline T ei_random () { return internal::random<T>(); }
template<typename T> inline T ei_random (const T& x, const T& y) { return internal::random(x, y); }
template<typename T> inline T precision () { return NumTraits<T>::dummy_precision(); }
template<typename Scalar, typename OtherScalar>
inline bool ei_isMuchSmallerThan(const Scalar& x, const OtherScalar& y,
typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision())
@@ -51,14 +54,14 @@ template<typename Scalar>
inline bool ei_isApprox(const Scalar& x, const Scalar& y,
typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision())
{
return internal::isMuchSmallerThan(x, y, precision);
return internal::isApprox(x, y, precision);
}
template<typename Scalar>
inline bool ei_isApproxOrLessThan(const Scalar& x, const Scalar& y,
typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision())
{
return internal::isMuchSmallerThan(x, y, precision);
return internal::isApproxOrLessThan(x, y, precision);
}
#endif // EIGEN2_MATH_FUNCTIONS_H

View File

@@ -0,0 +1,56 @@
// This file is part of Eigen, a lightweight C++ template library
// for linear algebra.
//
// Copyright (C) 2011 Benoit Jacob <jacob.benoit.1@gmail.com>
//
// Eigen is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 3 of the License, or (at your option) any later version.
//
// Alternatively, you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
// published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License and a copy of the GNU General Public License along with
// Eigen. If not, see <http://www.gnu.org/licenses/>.
#ifndef EIGEN2_MEMORY_H
#define EIGEN2_MEMORY_H
inline void* ei_aligned_malloc(size_t size) { return internal::aligned_malloc(size); }
inline void ei_aligned_free(void *ptr) { internal::aligned_free(ptr); }
inline void* ei_aligned_realloc(void *ptr, size_t new_size, size_t old_size) { return internal::aligned_realloc(ptr, new_size, old_size); }
template<bool Align> inline void* ei_conditional_aligned_malloc(size_t size)
{
return internal::conditional_aligned_malloc<Align>(size);
}
template<bool Align> inline void ei_conditional_aligned_free(void *ptr)
{
internal::conditional_aligned_free<Align>(ptr);
}
template<bool Align> inline void* ei_conditional_aligned_realloc(void* ptr, size_t new_size, size_t old_size)
{
return internal::conditional_aligned_realloc<Align>(ptr, new_size, old_size);
}
template<typename T> inline T* ei_aligned_new(size_t size)
{
return internal::aligned_new<T>(size);
}
template<typename T> inline void ei_aligned_delete(T *ptr, size_t size)
{
return internal::aligned_delete(ptr, size);
}
#endif // EIGEN2_MACROS_H