Gonzalo Rodriguez Fernandez / gammalib

Commit edda0986e25794f9fbaba80adfe2124ee9d4468f

Authored by Jean-Baptiste CAYROU
1 parent 5a70b809

change test_assert by test_value

Inline Side-by-side
Showing 1 changed file with 32 additions and 40 deletions
test/test_GVector.cpp
  View file @edda098
... ... @@ -77,7 +77,7 @@ void TestGVector::test3(void){
77 77 GVector test3(3);
78 78 test3[1] = acos(-1.0);
79 79  
80   - test_assert(test3[0]==0&&test3[1]==acos(-1.0)&&test3[2]==0,"test3 == (0, pi, 0)");
  80 + test_value(test3[1],acos(-1.0),1e-6,"test3 == (0, pi, 0)");
81 81 test_assert(test3.size()==3,"test3.size()==3");
82 82  
83 83 #if defined(G_RANGE_CHECK)
... ... @@ -129,11 +129,10 @@ void TestGVector::test6(void){
129 129 // GVector += 2.0
130 130 m_result = m_test;
131 131 m_result += 2.0;
132   - test_assert(m_result[0]==m_test[0]+2.0&&
133   - m_result[1]==m_test[1]+2.0&&
134   - m_result[2]==m_test[2]+2.0&&
135   - m_result[3]==m_test[3]+2.0&&
136   - m_result[4]==m_test[4]+2.0,"GVector += 2.0");
  132 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector += 2.0 (1)");
  133 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector += 2.0 (2)");
  134 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector += 2.0 (3)");
  135 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector += 2.0 (4)");
137 136  
138 137 // GVector -= GVector
139 138 m_result = m_test;
... ... @@ -182,7 +181,7 @@ void TestGVector::test6(void){
182 181 // Devide by zero
183 182 m_result = m_test;
184 183 m_result /= 0.0;
185   - test_assert(m_result.print()=="(inf, inf, inf, inf, inf)","Devide by zero");
  184 + test_assert(m_result.print()=="(inf, inf, inf, inf, inf)","Devide by zero",m_result.print());
186 185  
187 186 // GVector + GVector
188 187 m_result = m_test + m_test;
... ... @@ -194,34 +193,31 @@ void TestGVector::test6(void){
194 193  
195 194 // GVector + 2.0
196 195 m_result = m_test + 2.0;
197   - test_assert(m_result[0]==m_test[0]+2.0&&
198   - m_result[1]==m_test[1]+2.0&&
199   - m_result[2]==m_test[2]+2.0&&
200   - m_result[3]==m_test[3]+2.0&&
201   - m_result[4]==m_test[4]+2.0,"GVector + 2.0");
  196 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2.0 (1)");
  197 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2.0 (2)");
  198 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2.0 (3)");
  199 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2.0 (4)");
202 200  
203 201 // GVector + 2
204 202 m_result = m_test + 2;
205   - test_assert(m_result[0]==m_test[0]+2&&
206   - m_result[1]==m_test[1]+2&&
207   - m_result[2]==m_test[2]+2&&
208   - m_result[3]==m_test[3]+2&&
209   - m_result[4]==m_test[4]+2,"GVector + 2");
  203 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2 (1)");
  204 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2 (2)");
  205 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2 (3)");
  206 + test_value(m_result[0],m_test[0]+2,1e-6,"GVector + 2 (4)");
  207 +
210 208 //
211 209 m_result = 2.0 + m_test;
212   - test_assert(m_result[0]==m_test[0]+2&&
213   - m_result[1]==m_test[1]+2&&
214   - m_result[2]==m_test[2]+2&&
215   - m_result[3]==m_test[3]+2&&
216   - m_result[4]==m_test[4]+2,"2.0 + GVector");
  210 + test_value(m_result[0],m_test[0]+2,1e-6,"2.0 + GVector (1)");
  211 + test_value(m_result[0],m_test[0]+2,1e-6,"2.0 + GVector (2)");
  212 + test_value(m_result[0],m_test[0]+2,1e-6,"2.0 + GVector (3)");
  213 + test_value(m_result[0],m_test[0]+2,1e-6,"2.0 + GVector (4)");
217 214  
218 215 // 2 + GVector
219 216 m_result = 2 + m_test;
220   - test_assert(m_result[0]==m_test[0]+2&&
221   - m_result[1]==m_test[1]+2&&
222   - m_result[2]==m_test[2]+2&&
223   - m_result[3]==m_test[3]+2&&
224   - m_result[4]==m_test[4]+2,"2 + GVector");
  217 + test_value(m_result[0],m_test[0]+2,1e-6,"2 + GVector (1)");
  218 + test_value(m_result[0],m_test[0]+2,1e-6,"2 + GVector (2)");
  219 + test_value(m_result[0],m_test[0]+2,1e-6,"2 + GVector (3)");
  220 + test_value(m_result[0],m_test[0]+2,1e-6,"2 + GVector (4)");
225 221  
226 222 // GVector - GVector
227 223 m_result = m_test - m_test;
... ... @@ -248,13 +244,13 @@ void TestGVector::test6(void){
248 244 m_result[4]==2-m_test[4],"2.0 - GVector");
249 245  
250 246 // Scalar (or dot) product GVector * GVector
251   - test_assert(m_test[0]*m_test[0]+
  247 + test_value( m_test[0]*m_test[0]+
252 248 m_test[1]*m_test[1]+
253 249 m_test[2]*m_test[2]+
254 250 m_test[3]*m_test[3]+
255   - m_test[4]*m_test[4]== m_test * m_test,
256   - "Scalar (or dot) product GVector * GVector",
257   - str(m_test[0]*m_test[0]+m_test[1]*m_test[1]+m_test[2]*m_test[2]+m_test[3]*m_test[3]+m_test[4]*m_test[4])+" not equal to "+str(m_test*m_test));
  251 + m_test[4]*m_test[4],
  252 + m_test * m_test,
  253 + 1e-6,"Scalar (or dot) product GVector * GVector");
258 254  
259 255 // GVector * 2.0
260 256 m_result = m_test * 2.0;
... ... @@ -273,18 +269,14 @@ void TestGVector::test6(void){
273 269 m_result[4]==m_test[4]*2,"2.0 * GVector");
274 270  
275 271 // |GVector| (vector norm))
276   - test_assert(sqrt( m_test[0]*m_test[0]+
277   - m_test[1]*m_test[1]+
278   - m_test[2]*m_test[2]+
279   - m_test[3]*m_test[3]+
280   - m_test[4]*m_test[4])==norm(m_test),
281   - "|GVector| (vector norm))",
282   - str(sqrt( m_test[0]*m_test[0]+
  272 + test_value(sqrt( m_test[0]*m_test[0]+
283 273 m_test[1]*m_test[1]+
284 274 m_test[2]*m_test[2]+
285 275 m_test[3]*m_test[3]+
286   - m_test[4]*m_test[4]))+" not equal to "+str(norm(m_test))
287   - );
  276 + m_test[4]*m_test[4]),
  277 + norm(m_test),
  278 + 1e-6,
  279 + "|GVector| (vector norm)");
288 280  
289 281 // min(GVector)
290 282 test_assert(min(m_test)==1.1,"min(GVector)");
... ...