Johan Bregeon / gammalib

Commit 411257ef49f54fdc2abec7fa6e7e2a781bd7467a

Authored by Jürgen Knödlseder
1 parent 139fd05c

Reduce requirements on optimizer precision and rename header files. 

The requirements on the optimizer precision were too tight, and led to errors on some Operating Systems. We thus relaxed the requirements.

The header files were renamed so that they are compliant with the C++ file names.
Inline Side-by-side
Showing 6 changed files with 23 additions and 26 deletions
inst/cta/test/test_CTA.cpp
  View file @411257e
... ... @@ -33,7 +33,7 @@
33 33 #include <unistd.h>
34 34 #include "GCTALib.hpp"
35 35 #include "GTools.hpp"
36   -#include "test_GCTA.hpp"
  36 +#include "test_CTA.hpp"
37 37  
38 38 /* __ Namespaces _________________________________________________________ */
39 39  
... ... @@ -544,8 +544,8 @@ void TestGCTAOptimize::test_unbinned_optimizer(void)
544 544 GModel& model = obs.models()[i];
545 545 for (int k = 0; k < model.size(); ++k) {
546 546 std::string msg = "Verify optimization result for " + model[k].print();
547   - test_value(model[k].real_value(), fit_results[j++], 1.0e-6, msg);
548   - test_value(model[k].real_error(), fit_results[j++], 1.0e-6, msg);
  547 + test_value(model[k].real_value(), fit_results[j++], 5.0e-5, msg);
  548 + test_value(model[k].real_error(), fit_results[j++], 5.0e-5, msg);
549 549 }
550 550 }
551 551 }
... ... @@ -605,8 +605,8 @@ void TestGCTAOptimize::test_binned_optimizer(void)
605 605 GModel& model = obs.models()[i];
606 606 for (int k = 0; k < model.size(); ++k) {
607 607 std::string msg = "Verify optimization result for " + model[k].print();
608   - test_value(model[k].real_value(), fit_results[j++], 1.0e-6, msg);
609   - test_value(model[k].real_error(), fit_results[j++], 1.0e-6, msg);
  608 + test_value(model[k].real_value(), fit_results[j++], 5.0e-5, msg);
  609 + test_value(model[k].real_error(), fit_results[j++], 5.0e-5, msg);
610 610 }
611 611 }
612 612 }
... ...
inst/cta/test/test_GCTA.hpp renamed to inst/cta/test/test_CTA.hpp
  View file @411257e
... ... @@ -24,8 +24,8 @@
24 24 * @author Juergen Knoedlseder
25 25 */
26 26  
27   -#ifndef TEST_GCTA_HPP
28   -#define TEST_GCTA_HPP
  27 +#ifndef TEST_CTA_HPP
  28 +#define TEST_CTA_HPP
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include "GammaLib.hpp"
... ... @@ -95,4 +95,4 @@ public:
95 95 void test_binned_optimizer(void);
96 96 };
97 97  
98   -#endif /* TEST_GCTA_HPP */
  98 +#endif /* TEST_CTA_HPP */
... ...
inst/lat/test/test_LAT.cpp
  View file @411257e
... ... @@ -33,7 +33,7 @@
33 33 #include <unistd.h>
34 34 #include "GLATLib.hpp"
35 35 #include "GTools.hpp"
36   -#include "test_GLAT.hpp"
  36 +#include "test_LAT.hpp"
37 37  
38 38 /* __ Namespaces _________________________________________________________ */
39 39  
... ... @@ -685,8 +685,8 @@ void TestGLATOptimize::test_one_binned_optimizer(const std::string&amp; datadir,
685 685 //std::cout.precision(10);
686 686 //std::cout << model[k].real_value() << ", " << model[k].real_error() << "," << std::endl;
687 687 std::string msg = "Verify optimization result for " + model[k].print();
688   - test_value(model[k].real_value(), fit_results[j++], 1.0e-6, msg);
689   - test_value(model[k].real_error(), fit_results[j++], 1.0e-6, msg);
  688 + test_value(model[k].real_value(), fit_results[j++], 5.0e-5, msg);
  689 + test_value(model[k].real_error(), fit_results[j++], 5.0e-5, msg);
690 690 }
691 691 }
692 692 }
... ...
inst/lat/test/test_GLAT.hpp renamed to inst/lat/test/test_LAT.hpp
  View file @411257e
... ... @@ -24,8 +24,8 @@
24 24 * @author Juergen Knoedlseder
25 25 */
26 26  
27   -#ifndef TEST_GLAT_HPP
28   -#define TEST_GLAT_HPP
  27 +#ifndef TEST_LAT_HPP
  28 +#define TEST_LAT_HPP
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include "GammaLib.hpp"
... ... @@ -119,4 +119,4 @@ public:
119 119  
120 120 };
121 121  
122   -#endif /* TEST_GLAT_HPP */
  122 +#endif /* TEST_LAT_HPP */
... ...
inst/mwl/test/test_MWL.cpp
  View file @411257e
... ... @@ -31,7 +31,7 @@
31 31 #include <stdlib.h>
32 32 #include <iostream>
33 33 #include "GMWLLib.hpp"
34   -#include "test_GMWL.hpp"
  34 +#include "test_MWL.hpp"
35 35  
36 36 /* __ Namespaces _________________________________________________________ */
37 37  
... ... @@ -166,9 +166,6 @@ void TestGMWL::test_optimizer(void)
166 166 opt.max_iter(1000);
167 167 obs.optimize(opt);
168 168 test_try_success();
169   - //std::cout << obs << std::endl;
170   - //std::cout << std::endl << opt << std::endl;
171   - //std::cout << *(obs.models()) << std::endl;
172 169 }
173 170 catch (std::exception &e) {
174 171 test_try_failure(e);
... ... @@ -206,13 +203,13 @@ void TestGMWL::test_optimizer(void)
206 203 double fit_results[] = {83.6331, 0,
207 204 22.0145, 0,
208 205 0.00231438040883405, 0.000191759607698647,
209   - -3.1111154491587, 0.127038860468962,
  206 + -3.1111154491587, 0.127403,
210 207 1, 0,
211 208 1, 0,
212 209 83.6331, 0,
213 210 22.0145, 0,
214 211 4.5050091460345e-11, 1.95885803229878e-12,
215   - -2.13740092737976, 0.00577184857411904,
  212 + -2.13740092737976, 0.00578641,
216 213 1000, 0,
217 214 1, 0};
218 215 test_try("Perform LM optimization");
... ... @@ -227,8 +224,8 @@ void TestGMWL::test_optimizer(void)
227 224 GModel& model = obs.models()[i];
228 225 for (int k = 0; k < model.size(); ++k) {
229 226 std::string msg = "Verify optimization result for " + model[k].print();
230   - test_value(model[k].real_value(), fit_results[j++], 1.0e-6, msg);
231   - test_value(model[k].real_error(), fit_results[j++], 1.0e-6, msg);
  227 + test_value(model[k].real_value(), fit_results[j++], 1.0e-4, msg);
  228 + test_value(model[k].real_error(), fit_results[j++], 1.0e-3, msg);
232 229 }
233 230 }
234 231 }
... ...
inst/mwl/test/test_GMWL.hpp renamed to inst/mwl/test/test_MWL.hpp
  View file @411257e
1 1 /***************************************************************************
2   - * test_MWL.cpp - Test multi-wavelength classes *
  2 + * test_MWL.hpp - Test multi-wavelength classes *
3 3 * ----------------------------------------------------------------------- *
4 4 * copyright (C) 2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
... ... @@ -24,8 +24,8 @@
24 24 * @author Juergen Knoedlseder
25 25 */
26 26  
27   -#ifndef TEST_GMWL_HPP
28   -#define TEST_GMWL_HPP
  27 +#ifndef TEST_MWL_HPP
  28 +#define TEST_MWL_HPP
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include "GammaLib.hpp"
... ... @@ -51,4 +51,4 @@ public:
51 51 void test_optimizer(void);
52 52 };
53 53  
54   -#endif /* TEST_GMWL_HPP */
  54 +#endif /* TEST_MWL_HPP */
... ...