Merge branch 'master' of /Volumes/GecodeGitMigration/gecode-git

Author: guidotack

Makefile.dep

@@ -147,13 +147,13 @@ SUPPORTSRC0 = \
 	thread/thread thread/windows thread/pthreads \
 	hw-rnd
 SUPPORTHDR0 = \
-	block-allocator cast dynamic-array \
+	block-allocator cast hash dynamic-array \
 	dynamic-stack exception allocator heap \
 	macros random sort static-stack \
 	marked-pointer int-type auto-link \
 	thread thread/thread thread/windows thread/pthreads thread/none timer \
 	dynamic-queue bitset-base bitset bitset-offset \
-	hw-rnd run-jobs
+	hw-rnd run-jobs ref-count
 
 SUPPORTSRC1	=  $(SUPPORTSRC0:%=gecode/support/%.cpp)
 SUPPORTHDR 	=  gecode/support.hh \
@@ -194,26 +194,32 @@ VARIMPHDR = \
 VARIMP = $(VARIMPHDR)
 
 KERNELSRC0 = \
-	archive core memory-manager branch region \
-	afc action chb rnd exception \
-	trace-recorder trace-filter tracer trace
+	archive core exception gpi \
+	data/rnd \
+	branch/action branch/afc branch/chb branch/function \
+	memory/manager memory/region \
+	trace/recorder trace/filter trace/tracer trace/general
 
 KERNELHDR0 = \
-	archive array shared-array shared-data core exception \
-	macros memory-config memory-manager region modevent range-list \
-	propagator advisor view var \
-	branch-var branch-val branch-tiebreak \
-	brancher-view-sel brancher-merit \
-	brancher-val-sel brancher-val-commit brancher-view brancher-view-val \
-	brancher-val-sel-commit brancher-print brancher-filter \
-	allocators gpi \
-	afc action chb rnd branch-traits \
-	trace-traits trace-filter tracer trace-recorder trace trace-print \
-	subscribed-propagators
+	archive core exception macros modevent gpi \
+	shared-object shared-space-data range-list \
+	view var \
+	memory/config memory/manager memory/region memory/allocators \
+	data/array data/rnd data/shared-array data/shared-data \
+	propagator/pattern propagator/advisor propagator/subscribed \
+	propagator/wait \
+	branch/var branch/val branch/tiebreak \
+	branch/traits branch/afc branch/action branch/chb \
+	branch/view-sel branch/merit \
+	branch/val-sel branch/val-commit branch/view branch/view-val \
+	branch/val-sel-commit branch/print branch/filter \
+	trace/traits trace/filter trace/tracer trace/recorder \
+	trace/general trace/print
+
 
 KERNELSRC 	= $(KERNELSRC0:%=gecode/kernel/%.cpp)
 KERNELHDR 	= \
-	gecode/kernel.hh gecode/kernel/wait.hh \
+	gecode/kernel.hh \
 	$(KERNELHDR0:%=gecode/kernel/%.hpp)
 KERNELOBJ	= $(KERNELSRC:%.cpp=%$(OBJSUFFIX))
 
@@ -235,7 +241,8 @@ export KERNELRES	=
 export KERNELRC		=
 endif
 
-KERNELBUILDDIRS = kernel
+KERNELBUILDDIRS = kernel \
+	kernel/data kernel/propagator kernel/branch kernel/memory kernel/trace
 
 ifeq "@enable_flatzinc@" "yes"
 EXTRA_HEADERS   = gecode/support/config.hpp gecode/flatzinc/parser.tab.hh
@@ -249,27 +256,24 @@ endif
 
 SEARCHSRC0 = \
 	stop options cutoff engine \
-	parallel/engine \
-	dfs parallel/dfs \
-	bab parallel/bab \
-	lds sequential/lds \
-	sequential/path parallel/path \
-	meta/rbs meta/nogoods meta/dead \
-	meta/sequential/pbs meta/parallel/pbs \
-	rbs pbs sebs exception
+	dfs bab lds \
+	seq/rbs seq/dead seq/pbs par/pbs \
+	rbs pbs sebs nogoods exception tracer \
+	cpprofiler/tracer
 SEARCHHDR0 = \
 	statistics.hpp stop.hpp options.hpp cutoff.hpp \
-	support.hh worker.hh exception.hpp \
-	engine.hpp base.hpp build.hpp traits.hpp sebs.hpp \
-	sequential/path.hh sequential/dfs.hh sequential/bab.hh \
-	sequential/lds.hh \
-	parallel/path.hh parallel/engine.hh \
-	parallel/dfs.hh parallel/bab.hh \
-	meta/rbs.hh meta/rbs.hpp meta/nogoods.hh meta/dead.hh \
-	meta/sequential/pbs.hh meta/parallel/pbs.hh \
-	meta/sequential/pbs.hpp meta/parallel/pbs.hpp \
+	support.hh worker.hh exception.hpp engine.hpp base.hpp \
+	nogoods.hh nogoods.hpp build.hpp traits.hpp sebs.hpp \
+	seq/path.hh seq/path.hpp seq/dfs.hh seq/dfs.hpp \
+	seq/bab.hh seq/bab.hpp seq/lds.hh seq/lds.hpp \
+	seq/rbs.hh seq/rbs.hpp seq/dead.hh \
+	seq/pbs.hh seq/pbs.hpp \
+	par/path.hh par/path.hpp par/engine.hh par/engine.hpp \
+	par/dfs.hh par/dfs.hpp par/bab.hh par/bab.hpp \
+	par/pbs.hh par/pbs.hpp \
 	dfs.hpp bab.hpp lds.hpp rbs.hpp pbs.hpp \
-	relax.hh
+	relax.hh tracer.hpp trace-recorder.hpp \
+	cpprofiler/message.hpp cpprofiler/connector.hpp
 
 SEARCHSRC	= $(SEARCHSRC0:%=gecode/search/%.cpp)
 SEARCHHDR	= gecode/search.hh $(SEARCHHDR0:%=gecode/search/%)
@@ -301,10 +305,8 @@ export LINKSEARCH       =
 export SEARCHRES	=
 export SEARCHRC		=
 endif
-SEARCHBUILDDIRS = search \
-	search/sequential search/parallel \
-	search/meta \
-	search/meta/sequential search/meta/parallel
+SEARCHBUILDDIRS = search search/seq search/par search/cpprofiler
+
 
 #
 # INTEGER COMPONENTS
@@ -370,8 +372,8 @@ INTHDR0 = \
 	linear/int-nary.hpp linear/int-dom.hpp \
 	linear/bool-int.hpp linear/bool-view.hpp linear/bool-scale.hpp \
 	extensional/dfa.hpp extensional/layered-graph.hpp \
-	extensional/tuple-set.hpp extensional/base.hpp \
-	extensional/basic.hpp extensional/incremental.hpp \
+	extensional/tuple-set.hpp extensional/compact.hpp \
+	extensional/tiny-bit-set.hpp extensional/bit-set.hpp \
 	rel/eq.hpp rel/lex.hpp rel/lq-le.hpp rel/nq.hpp \
 	sorted/matching.hpp sorted/narrowing.hpp \
 	sorted/order.hpp sorted/propagate.hpp sorted/sortsup.hpp \
@@ -635,7 +637,7 @@ SETBUILDDIRS	=						\
 
 MMSRC0 = \
 	int-expr.cpp int-rel.cpp int-arith.cpp bool-expr.cpp \
-	set-expr.cpp set-rel.cpp \
+	set-expr.cpp set-rel.cpp dom.cpp \
 	float-expr.cpp float-rel.cpp float-arith.cpp \
 	reg.cpp optimize.cpp exception.cpp
 MMHDR0 = \
@@ -803,10 +805,11 @@ endif
 # FLATZINC
 #
 
-FLATZINCSRC0 = flatzinc.cpp registry.cpp
+FLATZINCSRC0 = flatzinc.cpp registry.cpp branch.cpp
 FLATZINC_GENSRC0 = parser.tab.cpp lexer.yy.cpp
 FLATZINCHDR0 = ast.hh conexpr.hh option.hh parser.hh \
-	plugin.hh registry.hh symboltable.hh varspec.hh
+	plugin.hh registry.hh symboltable.hh varspec.hh \
+	branch.hh branch.hpp
 
 FLATZINCSRC = $(FLATZINCSRC0:%=gecode/flatzinc/%)
 FLATZINC_GENSRC = $(FLATZINC_GENSRC0:%=gecode/flatzinc/%)