Skip to content

Commit 30189d6

Browse files
committed
gpl: FFT variables in C++ google style
Signed-off-by: LucasYuki <lucasyuki@yahoo.com.br>
1 parent 34c2cb9 commit 30189d6

2 files changed

Lines changed: 100 additions & 100 deletions

File tree

src/gpl/src/fft.cpp

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -12,129 +12,129 @@
1212

1313
namespace gpl {
1414

15-
FFT::FFT(int binCntX, int binCntY, float binSizeX, float binSizeY)
16-
: binCntX_(binCntX),
17-
binCntY_(binCntY),
18-
binSizeX_(binSizeX),
19-
binSizeY_(binSizeY)
15+
FFT::FFT(int bin_cnt_x, int bin_cnt_y, float bin_size_x, float bin_size_y)
16+
: bin_cnt_X_(bin_cnt_x),
17+
bin_cnt_y_(bin_cnt_y),
18+
bin_size_x_(bin_size_x),
19+
bin_size_y_(bin_size_y)
2020
{
21-
binDensity_ = new float*[binCntX_];
22-
electroPhi_ = new float*[binCntX_];
23-
electroFieldX_ = new float*[binCntX_];
24-
electroFieldY_ = new float*[binCntX_];
25-
26-
for (int i = 0; i < binCntX_; i++) {
27-
binDensity_[i] = new float[binCntY_];
28-
electroPhi_[i] = new float[binCntY_];
29-
electroFieldX_[i] = new float[binCntY_];
30-
electroFieldY_[i] = new float[binCntY_];
31-
32-
for (int j = 0; j < binCntY_; j++) {
33-
binDensity_[i][j] = electroPhi_[i][j] = electroFieldX_[i][j]
34-
= electroFieldY_[i][j] = 0.0f;
21+
bin_density_ = new float*[bin_cnt_X_];
22+
electro_phi_ = new float*[bin_cnt_X_];
23+
electro_field_x_ = new float*[bin_cnt_X_];
24+
electro_field_y_ = new float*[bin_cnt_X_];
25+
26+
for (int i = 0; i < bin_cnt_X_; i++) {
27+
bin_density_[i] = new float[bin_cnt_y_];
28+
electro_phi_[i] = new float[bin_cnt_y_];
29+
electro_field_x_[i] = new float[bin_cnt_y_];
30+
electro_field_y_[i] = new float[bin_cnt_y_];
31+
32+
for (int j = 0; j < bin_cnt_y_; j++) {
33+
bin_density_[i][j] = electro_phi_[i][j] = electro_field_x_[i][j]
34+
= electro_field_y_[i][j] = 0.0f;
3535
}
3636
}
3737

38-
csTable_.resize(std::max(binCntX_, binCntY_) * 3 / 2, 0);
38+
cs_table_.resize(std::max(bin_cnt_X_, bin_cnt_y_) * 3 / 2, 0);
3939

40-
wx_.resize(binCntX_, 0);
41-
wxSquare_.resize(binCntX_, 0);
42-
wy_.resize(binCntY_, 0);
43-
wySquare_.resize(binCntY_, 0);
40+
wx_.resize(bin_cnt_X_, 0);
41+
wx_square_.resize(bin_cnt_X_, 0);
42+
wy_.resize(bin_cnt_y_, 0);
43+
wy_square_.resize(bin_cnt_y_, 0);
4444

45-
workArea_.resize(round(sqrt(std::max(binCntX_, binCntY_))) + 2, 0);
45+
work_area_.resize(round(sqrt(std::max(bin_cnt_X_, bin_cnt_y_))) + 2, 0);
4646

4747
constexpr auto kPi = std::numbers::pi_v<long double>;
4848

49-
for (int i = 0; i < binCntX_; i++) {
50-
wx_[i] = kPi * static_cast<float>(i) / static_cast<float>(binCntX_);
51-
wxSquare_[i] = wx_[i] * wx_[i];
49+
for (int i = 0; i < bin_cnt_X_; i++) {
50+
wx_[i] = kPi * static_cast<float>(i) / static_cast<float>(bin_cnt_X_);
51+
wx_square_[i] = wx_[i] * wx_[i];
5252
}
5353

54-
for (int i = 0; i < binCntY_; i++) {
55-
wy_[i] = kPi * static_cast<float>(i) / static_cast<float>(binCntY_)
56-
* binSizeY_ / binSizeX_;
57-
wySquare_[i] = wy_[i] * wy_[i];
54+
for (int i = 0; i < bin_cnt_y_; i++) {
55+
wy_[i] = kPi * static_cast<float>(i) / static_cast<float>(bin_cnt_y_)
56+
* bin_size_y_ / bin_size_x_;
57+
wy_square_[i] = wy_[i] * wy_[i];
5858
}
5959
}
6060

6161
FFT::~FFT()
6262
{
6363
using std::vector;
64-
for (int i = 0; i < binCntX_; i++) {
65-
delete[] binDensity_[i];
66-
delete[] electroPhi_[i];
67-
delete[] electroFieldX_[i];
68-
delete[] electroFieldY_[i];
64+
for (int i = 0; i < bin_cnt_X_; i++) {
65+
delete[] bin_density_[i];
66+
delete[] electro_phi_[i];
67+
delete[] electro_field_x_[i];
68+
delete[] electro_field_y_[i];
6969
}
70-
delete[] binDensity_;
71-
delete[] electroPhi_;
72-
delete[] electroFieldX_;
73-
delete[] electroFieldY_;
70+
delete[] bin_density_;
71+
delete[] electro_phi_;
72+
delete[] electro_field_x_;
73+
delete[] electro_field_y_;
7474

75-
csTable_.clear();
75+
cs_table_.clear();
7676
wx_.clear();
77-
wxSquare_.clear();
77+
wx_square_.clear();
7878
wy_.clear();
79-
wySquare_.clear();
79+
wy_square_.clear();
8080

81-
workArea_.clear();
81+
work_area_.clear();
8282
}
8383

8484
void FFT::updateDensity(int x, int y, float density)
8585
{
86-
binDensity_[x][y] = density;
86+
bin_density_[x][y] = density;
8787
}
8888

8989
std::pair<float, float> FFT::getElectroField(int x, int y) const
9090
{
91-
return std::make_pair(electroFieldX_[x][y], electroFieldY_[x][y]);
91+
return std::make_pair(electro_field_x_[x][y], electro_field_y_[x][y]);
9292
}
9393

9494
float FFT::getElectroPhi(int x, int y) const
9595
{
96-
return electroPhi_[x][y];
96+
return electro_phi_[x][y];
9797
}
9898

9999
void FFT::doFFT()
100100
{
101-
ddct2d(binCntX_,
102-
binCntY_,
101+
ddct2d(bin_cnt_X_,
102+
bin_cnt_y_,
103103
-1,
104-
binDensity_,
104+
bin_density_,
105105
nullptr,
106-
workArea_.data(),
107-
csTable_.data());
106+
work_area_.data(),
107+
cs_table_.data());
108108

109109
// Normalizations required to perform the inverse operation
110-
for (int i = 1; i < binCntX_; i++) {
111-
binDensity_[i][0] *= 0.5;
110+
for (int i = 1; i < bin_cnt_X_; i++) {
111+
bin_density_[i][0] *= 0.5;
112112
}
113-
for (int i = 1; i < binCntY_; i++) {
114-
binDensity_[0][i] *= 0.5;
113+
for (int i = 1; i < bin_cnt_y_; i++) {
114+
bin_density_[0][i] *= 0.5;
115115
}
116-
for (int i = 0; i < binCntX_; i++) {
117-
for (int j = 0; j < binCntY_; j++) {
118-
binDensity_[i][j] *= 4.0 / binCntX_ / binCntY_;
116+
for (int i = 0; i < bin_cnt_X_; i++) {
117+
for (int j = 0; j < bin_cnt_y_; j++) {
118+
bin_density_[i][j] *= 4.0 / bin_cnt_X_ / bin_cnt_y_;
119119
}
120120
}
121121

122122
// Solve the PDE in the new basis
123-
for (int i = 0; i < binCntX_; i++) {
123+
for (int i = 0; i < bin_cnt_X_; i++) {
124124
float wx = wx_[i];
125-
float wx2 = wxSquare_[i];
125+
float wx2 = wx_square_[i];
126126

127-
for (int j = 0; j < binCntY_; j++) {
127+
for (int j = 0; j < bin_cnt_y_; j++) {
128128
float wy = wy_[j];
129-
float wy2 = wySquare_[j];
129+
float wy2 = wy_square_[j];
130130

131-
float density = binDensity_[i][j];
131+
float density = bin_density_[i][j];
132132
float phi = 0;
133-
float electroX = 0, electroY = 0;
133+
float electro_x = 0, electro_y = 0;
134134

135135
if (i == 0 && j == 0) {
136136
// Removes the DC component
137-
phi = electroX = electroY = 0.0f;
137+
phi = electro_x = electro_y = 0.0f;
138138
} else {
139139
//////////// lutong
140140
// denom =
@@ -148,38 +148,38 @@ void FFT::doFFT()
148148
// a_ey = a_phi * wy / 2.0 ;
149149
///////////
150150
phi = density / (wx2 + wy2);
151-
electroX = phi * wx;
152-
electroY = phi * wy;
151+
electro_x = phi * wx;
152+
electro_y = phi * wy;
153153
}
154154

155-
electroPhi_[i][j] = phi;
156-
electroFieldX_[i][j] = electroX;
157-
electroFieldY_[i][j] = electroY;
155+
electro_phi_[i][j] = phi;
156+
electro_field_x_[i][j] = electro_x;
157+
electro_field_y_[i][j] = electro_y;
158158
}
159159
}
160160

161161
// Inverse DCT
162-
ddct2d(binCntX_,
163-
binCntY_,
162+
ddct2d(bin_cnt_X_,
163+
bin_cnt_y_,
164164
1,
165-
electroPhi_,
165+
electro_phi_,
166166
nullptr,
167-
workArea_.data(),
168-
csTable_.data());
169-
ddsct2d(binCntX_,
170-
binCntY_,
167+
work_area_.data(),
168+
cs_table_.data());
169+
ddsct2d(bin_cnt_X_,
170+
bin_cnt_y_,
171171
1,
172-
electroFieldX_,
172+
electro_field_x_,
173173
nullptr,
174-
workArea_.data(),
175-
csTable_.data());
176-
ddcst2d(binCntX_,
177-
binCntY_,
174+
work_area_.data(),
175+
cs_table_.data());
176+
ddcst2d(bin_cnt_X_,
177+
bin_cnt_y_,
178178
1,
179-
electroFieldY_,
179+
electro_field_y_,
180180
nullptr,
181-
workArea_.data(),
182-
csTable_.data());
181+
work_area_.data(),
182+
cs_table_.data());
183183
}
184184

185185
} // namespace gpl

src/gpl/src/fft.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace gpl {
1111
class FFT
1212
{
1313
public:
14-
FFT(int binCntX, int binCntY, float binSizeX, float binSizeY);
14+
FFT(int bin_cnt_x, int bin_cnt_y, float bin_size_x, float bin_size_y);
1515
~FFT();
1616

1717
// input func
@@ -27,31 +27,31 @@ class FFT
2727
private:
2828
// 2D array; width: binCntX_, height: binCntY_;
2929
// No hope to use Vector at this moment...
30-
float** binDensity_ = nullptr;
31-
float** electroPhi_ = nullptr;
32-
float** electroFieldX_ = nullptr;
33-
float** electroFieldY_ = nullptr;
30+
float** bin_density_ = nullptr;
31+
float** electro_phi_ = nullptr;
32+
float** electro_field_x_ = nullptr;
33+
float** electro_field_y_ = nullptr;
3434

3535
// cos/sin table (prev: w_2d)
3636
// length: max(binCntX, binCntY) * 3 / 2
37-
std::vector<float> csTable_;
37+
std::vector<float> cs_table_;
3838

3939
// wx. length: binCntX_
4040
std::vector<float> wx_;
41-
std::vector<float> wxSquare_;
41+
std::vector<float> wx_square_;
4242

4343
// wy. length: binCntY_
4444
std::vector<float> wy_;
45-
std::vector<float> wySquare_;
45+
std::vector<float> wy_square_;
4646

4747
// work area for bit reversal (prev: ip)
4848
// length: round(sqrt( max(binCntX_, binCntY_) )) + 2
49-
std::vector<int> workArea_;
49+
std::vector<int> work_area_;
5050

51-
int binCntX_ = 0;
52-
int binCntY_ = 0;
53-
float binSizeX_ = 0;
54-
float binSizeY_ = 0;
51+
int bin_cnt_X_ = 0;
52+
int bin_cnt_y_ = 0;
53+
float bin_size_x_ = 0;
54+
float bin_size_y_ = 0;
5555
};
5656

5757
//

0 commit comments

Comments
 (0)