Commit 6bdc758a6a9e04200433f6e4d987d8a7c9d35220
1 parent
12e667bc
add GDerivative and GFunction
Showing
4 changed files
with
14 additions
and
1 deletions
include/GModelData.hpp
| ... | ... | @@ -22,6 +22,10 @@ |
| 22 | 22 | /* __ Includes ___________________________________________________________ */ |
| 23 | 23 | #include <vector> |
| 24 | 24 | #include <string> |
| 25 | +#include "GEnergy.hpp" | |
| 26 | +#include "GTime.hpp" | |
| 27 | +#include "GEvent.hpp" | |
| 28 | +#include "GObservation.hpp" | |
| 25 | 29 | #include "GModel.hpp" |
| 26 | 30 | #include "GModelPar.hpp" |
| 27 | 31 | #include "GXmlElement.hpp" |
| ... | ... | @@ -64,6 +68,8 @@ public: |
| 64 | 68 | virtual std::string type(void) const = 0; |
| 65 | 69 | virtual double eval(const GEvent& event, const GObservation& obs) = 0; |
| 66 | 70 | virtual double eval_gradients(const GEvent& event, const GObservation& obs) = 0; |
| 71 | + virtual double npred(const GEnergy& obsEng, const GTime& obsTime, | |
| 72 | + const GObservation& obs) = 0; | |
| 67 | 73 | virtual void read(const GXmlElement& xml) = 0; |
| 68 | 74 | virtual void write(GXmlElement& xml) const = 0; |
| 69 | 75 | virtual std::string print(void) const = 0; | ... | ... |
include/GammaLib.hpp
| ... | ... | @@ -36,6 +36,8 @@ |
| 36 | 36 | #include "GSparseMatrix.hpp" |
| 37 | 37 | #include "GIntegral.hpp" |
| 38 | 38 | #include "GIntegrand.hpp" |
| 39 | +#include "GDerivative.hpp" | |
| 40 | +#include "GFunction.hpp" | |
| 39 | 41 | |
| 40 | 42 | /* __ FITS module ________________________________________________________ */ |
| 41 | 43 | #include "GFits.hpp" | ... | ... |
include/Makefile.am
src/numerics/Makefile.am
| ... | ... | @@ -7,7 +7,10 @@ INCLUDES = -I$(top_srcdir)/include \ |
| 7 | 7 | |
| 8 | 8 | # Define sources for this directory |
| 9 | 9 | sources = GIntegral.cpp \ |
| 10 | - GIntegrand.cpp | |
| 10 | + GIntegrand.cpp \ | |
| 11 | + GDerivative.cpp \ | |
| 12 | + GFunction.cpp \ | |
| 13 | + GException_numerics.cpp | |
| 11 | 14 | |
| 12 | 15 | # Build libtool library |
| 13 | 16 | noinst_LTLIBRARIES = libnumerics.la | ... | ... |