1
0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-06-18 07:17:05 +01:00

now HDF5, Minuit and NLopt are really optional dependencies

This commit is contained in:
2016-04-12 20:31:53 +01:00
parent 9bf538dfca
commit bd9e0262ca
6 changed files with 23 additions and 21 deletions

View File

@ -9,18 +9,17 @@ endif
noinst_PROGRAMS = \
exCompiledDoubleFunction\
exDerivative \
exFit \
exFitSample \
exIntegrator \
exInterp \
exMat \
exMathInterpreter \
exMin \
exPlot \
exRand \
exRootFinder
if HAVE_MINUIT
noinst_PROGRAMS += exFit exFitSample exMin
endif
exCompiledDoubleFunction_SOURCES = exCompiledDoubleFunction.cpp
exCompiledDoubleFunction_CXXFLAGS = $(COM_CXXFLAGS)
exCompiledDoubleFunction_LDFLAGS = -L../lib/.libs -lLatAnalyze
@ -29,7 +28,6 @@ exDerivative_SOURCES = exDerivative.cpp
exDerivative_CXXFLAGS = $(COM_CXXFLAGS)
exDerivative_LDFLAGS = -L../lib/.libs -lLatAnalyze
if HAVE_MINUIT
exFit_SOURCES = exFit.cpp
exFit_CXXFLAGS = $(COM_CXXFLAGS)
exFit_LDFLAGS = -L../lib/.libs -lLatAnalyze
@ -37,7 +35,6 @@ exFit_LDFLAGS = -L../lib/.libs -lLatAnalyze
exFitSample_SOURCES = exFitSample.cpp
exFitSample_CXXFLAGS = $(COM_CXXFLAGS)
exFitSample_LDFLAGS = -L../lib/.libs -lLatAnalyze
endif
exInterp_SOURCES = exInterp.cpp
exInterp_CXXFLAGS = $(COM_CXXFLAGS)
@ -51,11 +48,9 @@ exMat_SOURCES = exMat.cpp
exMat_CXXFLAGS = $(COM_CXXFLAGS)
exMat_LDFLAGS = -L../lib/.libs -lLatAnalyze
if HAVE_MINUIT
exMin_SOURCES = exMin.cpp
exMin_CXXFLAGS = $(COM_CXXFLAGS)
exMin_LDFLAGS = -L../lib/.libs -lLatAnalyze
endif
exMathInterpreter_SOURCES = exMathInterpreter.cpp
exMathInterpreter_CXXFLAGS = $(COM_CXXFLAGS)

View File

@ -8,7 +8,7 @@ using namespace Latan;
int main(void)
{
DMat A(2, 3), B(3, 2), C = DMat::Random(6, 6);
const string fileName = "exMat.h5";
const string fileName = "exMat.dat";
A << 1, 2, 3,
4, 5, 6;

View File

@ -1,5 +1,5 @@
#include <LatAnalyze/CompiledFunction.hpp>
#include <LatAnalyze/MinuitMinimizer.hpp>
#include <LatAnalyze/GslMinimizer.hpp>
using namespace std;
using namespace Latan;
@ -16,8 +16,8 @@ int main(int argc, char* argv[])
}
source = argv[1];
DoubleFunction f = compile(source, 1);
MinuitMinimizer minimize;
DoubleFunction f = compile(source, 1);
GslMinimizer minimize;
DVec init(1);
double min;