@@ -18,10 +18,10 @@ class CG_test : public testing::Test
1818 double residual = 10 .;
1919 double tol = 1e-5 ;
2020 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 ;
2525
2626 void SetUp ()
2727 {
@@ -65,7 +65,8 @@ class CG_test : public testing::Test
6565 tools.le .get_Ap (tools.le .A , p, Ap);
6666 int ifPD = 0 ;
6767 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+ }
6970 residual = cg.get_residual ();
7071 }
7172 }
@@ -102,14 +103,16 @@ class CG_test : public testing::Test
102103 {
103104 tools.dfuncdx (x, gradient, func_label);
104105 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+ }
106108 if (residual < tol)
107109 {
108110 final_iter = iter;
109111 break ;
110112 }
111113 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+ }
113116 task[0 ] = ' S' ; task[1 ] = ' T' ; task[2 ] = ' A' ; task[3 ] = ' R' ; task[4 ] = ' T' ;
114117 while (true )
115118 {
@@ -118,7 +121,8 @@ class CG_test : public testing::Test
118121 ds.dcSrch (f, g, step, task);
119122 if (task[0 ] == ' F' && task[1 ] == ' G' )
120123 {
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+ }
122126 continue ;
123127 }
124128 else if (task[0 ] == ' C' && task[1 ] == ' O' )
@@ -134,7 +138,8 @@ class CG_test : public testing::Test
134138 break ;
135139 }
136140 }
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+ }
138143 }
139144 delete[] temp_x;
140145 delete[] gradient;
0 commit comments