diff --git a/.gitignore b/.gitignore index 22e55cf..4ae3f3e 100644 --- a/.gitignore +++ b/.gitignore @@ -68,12 +68,15 @@ config.sub configure test-driver src/gammalib-setup +src/template/test_GClass doc/Doxyfile.bak + test/test_url.dat test/*.xml test/reports/*.xml test/*.trs test/region.reg + examples/python/*.xml examples/python/*.html examples/cpp/*/*.fits @@ -85,6 +88,7 @@ examples/cpp/readmodel/readmodel examples/cpp/numerics/numerics examples/cpp/optimize/optimize examples/cpp/interpolate/interpolate +examples/cpp/readmodel/readmodel # Binaries test/test_GApplication @@ -106,5 +110,4 @@ test/test_LAT test/test_MWL test/test_CTA test/test_COM -examples/cpp/readmodel/readmodel diff --git a/src/template/GClass.cpp b/src/template/GClass.cpp index 56c3887..367835f 100644 --- a/src/template/GClass.cpp +++ b/src/template/GClass.cpp @@ -158,14 +158,14 @@ GClass* GClass::clone(void) const /***********************************************************************//** * @brief Print class information ***************************************************************************/ -std::string GClass::print(void) const +std::string GClass::print(const GChatter& chatter) const { // Initialise result string std::string result; // Append header result.append("=== GClass ==="); - result.append("\n"+parformat("Name")+m_name); + result.append("\n"+gammalib::parformat("Name")+m_name); // Return result return result; @@ -220,41 +220,3 @@ void GClass::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] c Class. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GClass& c) -{ - // Write class in output stream - os << c.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] c Class. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GClass& c) -{ - // Write class into logger - log << c.print(); - - // Return logger - return log; -} diff --git a/src/template/GClass.hpp b/src/template/GClass.hpp index f9301c8..1d3c160 100644 --- a/src/template/GClass.hpp +++ b/src/template/GClass.hpp @@ -51,7 +51,7 @@ public: // Methods void clear(void); GClass* clone(void) const; - std::string print(void) const; + std::string print(const GChatter& chatter = NORMAL) const; protected: // Protected methods diff --git a/src/template/Makefile b/src/template/Makefile new file mode 100644 index 0000000..7a0bede --- /dev/null +++ b/src/template/Makefile @@ -0,0 +1,8 @@ +CXX=g++ +CFLAGS=-I${GAMMALIB}/include/gammalib +LDFLAGS=-L${GAMMALIB}/lib -lgamma +DEPS= +OBJ=test_GClass.cpp GClass.cpp + +test_GClass: $(OBJ) + $(CXX) -o $@ $^ $(CFLAGS) $(LDFLAGS) diff --git a/src/template/test_GClass.cpp b/src/template/test_GClass.cpp new file mode 100644 index 0000000..cba4451 --- /dev/null +++ b/src/template/test_GClass.cpp @@ -0,0 +1,9 @@ +#include +#include "GammaLib.hpp" +#include "GClass.hpp" + +int main(void) { + GClass a; + std::cout << a << std::endl; + return 0; +}