From 6bdc758a6a9e04200433f6e4d987d8a7c9d35220 Mon Sep 17 00:00:00 2001
From: knodlseder <>
Date: Wed, 2 Feb 2011 14:02:57 +0000
Subject: [PATCH] add GDerivative and GFunction

---
 include/GModelData.hpp   | 6 ++++++
 include/GammaLib.hpp     | 2 ++
 include/Makefile.am      | 2 ++
 src/numerics/Makefile.am | 5 ++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/GModelData.hpp b/include/GModelData.hpp
index d02320b..1272a45 100644
--- a/include/GModelData.hpp
+++ b/include/GModelData.hpp
@@ -22,6 +22,10 @@
 /* __ Includes ___________________________________________________________ */
 #include <vector>
 #include <string>
+#include "GEnergy.hpp"
+#include "GTime.hpp"
+#include "GEvent.hpp"
+#include "GObservation.hpp"
 #include "GModel.hpp"
 #include "GModelPar.hpp"
 #include "GXmlElement.hpp"
@@ -64,6 +68,8 @@ public:
     virtual std::string type(void) const = 0;
     virtual double      eval(const GEvent& event, const GObservation& obs) = 0;
     virtual double      eval_gradients(const GEvent& event, const GObservation& obs) = 0;
+    virtual double      npred(const GEnergy& obsEng, const GTime& obsTime,
+                              const GObservation& obs) = 0;
     virtual void        read(const GXmlElement& xml) = 0;
     virtual void        write(GXmlElement& xml) const = 0;
     virtual std::string print(void) const = 0;
diff --git a/include/GammaLib.hpp b/include/GammaLib.hpp
index e6989f6..e410278 100644
--- a/include/GammaLib.hpp
+++ b/include/GammaLib.hpp
@@ -36,6 +36,8 @@
 #include "GSparseMatrix.hpp"
 #include "GIntegral.hpp"
 #include "GIntegrand.hpp"
+#include "GDerivative.hpp"
+#include "GFunction.hpp"
 
 /* __ FITS module ________________________________________________________ */
 #include "GFits.hpp"
diff --git a/include/Makefile.am b/include/Makefile.am
index 53c1277..a800944 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -104,6 +104,8 @@ pkginclude_HEADERS = GammaLib.hpp \
                      GSparseMatrix.hpp \
                      GIntegral.hpp \
                      GIntegrand.hpp \
+		     GDerivative.hpp \
+                     GFunction.hpp \
                      GOptimizer.hpp \
                      GOptimizerLM.hpp \
                      GOptimizerPars.hpp \
diff --git a/src/numerics/Makefile.am b/src/numerics/Makefile.am
index dd8b726..8e3554f 100644
--- a/src/numerics/Makefile.am
+++ b/src/numerics/Makefile.am
@@ -7,7 +7,10 @@ INCLUDES = -I$(top_srcdir)/include \
 
 # Define sources for this directory
 sources = GIntegral.cpp \
-          GIntegrand.cpp
+          GIntegrand.cpp \
+	  GDerivative.cpp \
+          GFunction.cpp \
+          GException_numerics.cpp
 
 # Build libtool library
 noinst_LTLIBRARIES = libnumerics.la
--
libgit2 0.21.4