Skip to content

Commit 8c521ff

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent 2391a68 commit 8c521ff

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

source/module_base/test/opt_CG_test.cpp

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ class CG_test : public testing::Test
2121
double residual = 10.;
2222
double tol = 1e-5;
2323
int final_iter = 0;
24-
char *task = NULL;
25-
double *Ap = NULL;
26-
double *p = NULL;
27-
double *x = NULL;
24+
char *task = nullptr;
25+
double *Ap = nullptr;
26+
double *p = nullptr;
27+
double *x = nullptr;
2828

2929
void SetUp()
3030
{
@@ -68,7 +68,8 @@ class CG_test : public testing::Test
6868
tools.le.get_Ap(tools.le.A, p, Ap);
6969
int ifPD = 0;
7070
step = cg.step_length(Ap, p, ifPD);
71-
for (int i = 0; i < 3; ++i) x[i] += step * p[i];
71+
for (int i = 0; i < 3; ++i) { x[i] += step * p[i];
72+
}
7273
residual = cg.get_residual();
7374
}
7475
}
@@ -105,14 +106,16 @@ class CG_test : public testing::Test
105106
{
106107
tools.dfuncdx(x, gradient, func_label);
107108
residual = 0;
108-
for (int i = 0; i<3 ;++i) residual += gradient[i] * gradient[i];
109+
for (int i = 0; i<3 ;++i) { residual += gradient[i] * gradient[i];
110+
}
109111
if (residual < tol)
110112
{
111113
final_iter = iter;
112114
break;
113115
}
114116
cg.next_direct(gradient, cg_label, p);
115-
for (int i = 0; i < 3; ++i) temp_x[i] = x[i];
117+
for (int i = 0; i < 3; ++i) { temp_x[i] = x[i];
118+
}
116119
task[0] = 'S'; task[1] = 'T'; task[2] = 'A'; task[3] = 'R'; task[4] = 'T';
117120
while (true)
118121
{
@@ -121,7 +124,8 @@ class CG_test : public testing::Test
121124
ds.dcSrch(f, g, step, task);
122125
if (task[0] == 'F' && task[1] == 'G')
123126
{
124-
for (int j = 0; j < 3; ++j) temp_x[j] = x[j] + step * p[j];
127+
for (int j = 0; j < 3; ++j) { temp_x[j] = x[j] + step * p[j];
128+
}
125129
continue;
126130
}
127131
else if (task[0] == 'C' && task[1] == 'O')
@@ -137,7 +141,8 @@ class CG_test : public testing::Test
137141
break;
138142
}
139143
}
140-
for (int i = 0; i < 3; ++i) x[i] += step * p[i];
144+
for (int i = 0; i < 3; ++i) { x[i] += step * p[i];
145+
}
141146
}
142147
delete[] temp_x;
143148
delete[] gradient;

source/module_base/test/opt_TN_test.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class TN_test : public testing::Test
1717
double tol = 1e-5;
1818
int final_iter = 0;
1919
int flag = 0;
20-
char *task = NULL;
21-
double *p = NULL;
22-
double *x = NULL;
20+
char *task = nullptr;
21+
double *p = nullptr;
22+
double *x = nullptr;
2323

2424
void SetUp()
2525
{
@@ -61,7 +61,8 @@ class TN_test : public testing::Test
6161
{
6262
tools.dfuncdx(x, gradient, func_label);
6363
residual = 0;
64-
for (int i = 0; i<3 ;++i) residual += gradient[i] * gradient[i];
64+
for (int i = 0; i<3 ;++i) { residual += gradient[i] * gradient[i];
65+
}
6566
if (residual < tol)
6667
{
6768
final_iter = iter;
@@ -75,7 +76,8 @@ class TN_test : public testing::Test
7576
{
7677
tn.next_direct(x, gradient, flag, p, &(tools.mf), &ModuleESolver::ESolver_OF::dfuncdx);
7778
}
78-
for (int i = 0; i < 3; ++i) temp_x[i] = x[i];
79+
for (int i = 0; i < 3; ++i) { temp_x[i] = x[i];
80+
}
7981
task[0] = 'S'; task[1] = 'T'; task[2] = 'A'; task[3] = 'R'; task[4] = 'T';
8082
while (true)
8183
{
@@ -84,7 +86,8 @@ class TN_test : public testing::Test
8486
ds.dcSrch(f, g, step, task);
8587
if (task[0] == 'F' && task[1] == 'G')
8688
{
87-
for (int j = 0; j < 3; ++j) temp_x[j] = x[j] + step * p[j];
89+
for (int j = 0; j < 3; ++j) { temp_x[j] = x[j] + step * p[j];
90+
}
8891
continue;
8992
}
9093
else if (task[0] == 'C' && task[1] == 'O')
@@ -100,7 +103,8 @@ class TN_test : public testing::Test
100103
break;
101104
}
102105
}
103-
for (int i = 0; i < 3; ++i) x[i] += step * p[i];
106+
for (int i = 0; i < 3; ++i) { x[i] += step * p[i];
107+
}
104108
}
105109
delete[] temp_x;
106110
delete[] gradient;

0 commit comments

Comments
 (0)