devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gael Guennebaud
2009-12-04 12:40:29 +01:00
parent 7aad434160 ffaea19a70
commit ea684af6b4
7 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unsupported/Eigen/AutoDiff
View File

@@ -25,7 +25,7 @@
#ifndef EIGEN_AUTODIFF_MODULE
#define EIGEN_AUTODIFF_MODULE
#include <Eigen/Core>
#include <Eigen/Array>
namespace Eigen {

8
unsupported/Eigen/src/FFT/ei_kissfft_impl.h
View File

@@ -160,7 +160,7 @@ struct ei_kiss_cpx_fft
scratch[0]=scratch[1]-scratch[2];
tw1 += fstride;
tw2 += fstride*2;
Fout[m] = Complex( Fout->real() - .5*scratch[3].real() , Fout->imag() - .5*scratch[3].imag() );
Fout[m] = Complex( Fout->real() - Scalar(.5)*scratch[3].real() , Fout->imag() - Scalar(.5)*scratch[3].imag() );
scratch[0] *= epi3.imag();
*Fout += scratch[3];
Fout[m2] = Complex( Fout[m].real() + scratch[0].imag() , Fout[m].imag() - scratch[0].real() );
@@ -377,10 +377,10 @@ struct ei_kissfft_impl
std::vector<Complex> m_tmpBuf2;
inline
int PlanKey(int nfft,bool isinverse) const { return (nfft<<1) | isinverse; }
int PlanKey(int nfft, bool isinverse) const { return (nfft<<1) | int(isinverse); }
inline
PlanData & get_plan(int nfft,bool inverse)
PlanData & get_plan(int nfft, bool inverse)
{
// TODO look for PlanKey(nfft, ! inverse) and conjugate the twiddles
PlanData & pd = m_plans[ PlanKey(nfft,inverse) ];
@@ -400,7 +400,7 @@ struct ei_kissfft_impl
int ncfft= ncfft2<<1;
Scalar pi = acos( Scalar(-1) );
for (int k=1;k<=ncfft2;++k)
twidref[k-1] = exp( Complex(0,-pi * ((double) (k) / ncfft + .5) ) );
twidref[k-1] = exp( Complex(0,-pi * (Scalar(k) / ncfft + Scalar(.5)) ) );
}
return &twidref[0];
}

5
unsupported/Eigen/src/NumericalDiff/NumericalDiff.h
View File

@@ -45,10 +45,11 @@ enum NumericalDiffMode {
*
* Currently only "Forward" and "Central" scheme are implemented.
*/
template<typename Functor, NumericalDiffMode mode=Forward>
class NumericalDiff : public Functor
template<typename _Functor, NumericalDiffMode mode=Forward>
class NumericalDiff : public _Functor
{
public:
typedef _Functor Functor;
typedef typename Functor::Scalar Scalar;
typedef typename Functor::InputType InputType;
typedef typename Functor::ValueType ValueType;