aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@serenitascapital.com>2016-02-18 18:13:02 -0500
committerBertrand <bertrand.horel@gmail.com>2016-04-15 14:35:07 +0200
commitb23e6679cfce2f3d4266cb318c3b4afec6073449 (patch)
tree424fd2038318905c207b4b5f0fba9a1978931e21 /Makefile
parent745160f29da6ec55fa48863768bcc1305edd9314 (diff)
downloadprojet_C++-b23e6679cfce2f3d4266cb318c3b4afec6073449.tar.gz
add Nlopt version of sobol which allows higher dimensions
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7f69f8a..6db45c9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
-CXX=g++
-CC=gcc
+CXX = g++
+CC = gcc
RM = rm
CXXFLAGS=-std=c++11 -g -O3 -Wall
+ifdef NLOPT
+ CXXFLAGS+= -DNLOPT
+endif
+CFLAGS=-O3
GSL_FLAGS:=$(shell pkg-config --libs gsl)
NLOPT_FLAGS:=$(shell pkg-config --libs nlopt)
VPATH = src:doc
@@ -17,15 +21,14 @@ table.tex: make_table
make_table: make_table.o mt19937.o
$(CXX) $^ -o $@
-projet: projet.o stratified_sampling.o mt19937.o var_alea.o opti.o rqmc.o p_adic.o option.o
+projet: projet.o stratified_sampling.o mt19937.o var_alea.o opti.o rqmc.o p_adic.o option.o sobolseq.o
$(CXX) $^ -o $@ $(GSL_FLAGS) $(NLOPT_FLAGS)
stratified_sampling.o: stratified_sampling.hpp
rqmc.o: rqmc.hpp
-option: option.o mt19937.o p_adic.o var_alea.o
- $(CXX) $^ -o $@ $(GSL_FLAGS)
+p_adic.o: low_discrepancy.hpp
.PHONY: clean