@@ -18,10 +18,10 @@ class CG_test : public testing::Test
18
18
double residual = 10 .;
19
19
double tol = 1e-5 ;
20
20
int final_iter = 0 ;
21
- char *task = NULL ;
22
- double *Ap = NULL ;
23
- double *p = NULL ;
24
- double *x = NULL ;
21
+ char *task = nullptr ;
22
+ double *Ap = nullptr ;
23
+ double *p = nullptr ;
24
+ double *x = nullptr ;
25
25
26
26
void SetUp ()
27
27
{
@@ -65,7 +65,8 @@ class CG_test : public testing::Test
65
65
tools.le .get_Ap (tools.le .A , p, Ap);
66
66
int ifPD = 0 ;
67
67
step = cg.step_length (Ap, p, ifPD);
68
- for (int i = 0 ; i < 3 ; ++i) x[i] += step * p[i];
68
+ for (int i = 0 ; i < 3 ; ++i) { x[i] += step * p[i];
69
+ }
69
70
residual = cg.get_residual ();
70
71
}
71
72
}
@@ -102,14 +103,16 @@ class CG_test : public testing::Test
102
103
{
103
104
tools.dfuncdx (x, gradient, func_label);
104
105
residual = 0 ;
105
- for (int i = 0 ; i<3 ;++i) residual += gradient[i] * gradient[i];
106
+ for (int i = 0 ; i<3 ;++i) { residual += gradient[i] * gradient[i];
107
+ }
106
108
if (residual < tol)
107
109
{
108
110
final_iter = iter;
109
111
break ;
110
112
}
111
113
cg.next_direct (gradient, cg_label, p);
112
- for (int i = 0 ; i < 3 ; ++i) temp_x[i] = x[i];
114
+ for (int i = 0 ; i < 3 ; ++i) { temp_x[i] = x[i];
115
+ }
113
116
task[0 ] = ' S' ; task[1 ] = ' T' ; task[2 ] = ' A' ; task[3 ] = ' R' ; task[4 ] = ' T' ;
114
117
while (true )
115
118
{
@@ -118,7 +121,8 @@ class CG_test : public testing::Test
118
121
ds.dcSrch (f, g, step, task);
119
122
if (task[0 ] == ' F' && task[1 ] == ' G' )
120
123
{
121
- for (int j = 0 ; j < 3 ; ++j) temp_x[j] = x[j] + step * p[j];
124
+ for (int j = 0 ; j < 3 ; ++j) { temp_x[j] = x[j] + step * p[j];
125
+ }
122
126
continue ;
123
127
}
124
128
else if (task[0 ] == ' C' && task[1 ] == ' O' )
@@ -134,7 +138,8 @@ class CG_test : public testing::Test
134
138
break ;
135
139
}
136
140
}
137
- for (int i = 0 ; i < 3 ; ++i) x[i] += step * p[i];
141
+ for (int i = 0 ; i < 3 ; ++i) { x[i] += step * p[i];
142
+ }
138
143
}
139
144
delete[] temp_x;
140
145
delete[] gradient;
0 commit comments