From b23e6679cfce2f3d4266cb318c3b4afec6073449 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@serenitascapital.com>
Date: Thu, 18 Feb 2016 18:13:02 -0500
Subject: add Nlopt version of sobol which allows higher dimensions

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Makefile')

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
 
-- 
cgit v1.2.3-70-g09d2