Skip to content

Commit

Permalink
Develop (#46)
Browse files Browse the repository at this point in the history
* Added order propagator for scheduling

* Added Job-Shop scheduling example
  • Loading branch information
chschulte authored Apr 4, 2019
1 parent d34425b commit c85453c
Show file tree
Hide file tree
Showing 10 changed files with 7,187 additions and 3 deletions.
318 changes: 318 additions & 0 deletions Makefile.dep

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ INTSRC0 = \
unshare.cpp sequence.cpp \
bin-packing.cpp bin-packing/propagate.cpp \
bin-packing/conflict-graph.cpp \
order.cpp order/propagate.cpp \
unary.cpp cumulative.cpp cumulatives.cpp \
circuit.cpp no-overlap.cpp nvalues.cpp \
member.cpp branch/action.cpp branch/chb.cpp \
Expand Down Expand Up @@ -398,6 +399,7 @@ INTHDR0 = \
task.hh task/fwd-to-bwd.hpp task/array.hpp task/sort.hpp \
task/iter.hpp task/tree.hpp task/purge.hpp task/prop.hpp \
task/man-to-opt.hpp task/event.hpp \
order.hh order/propagate.hpp \
unary.hh unary/task.hpp unary/task-view.hpp \
unary/tree.hpp unary/overload.hpp unary/detectable.hpp \
unary/time-tabling.hpp unary/not-first-not-last.hpp \
Expand Down Expand Up @@ -462,7 +464,7 @@ INTBUILDDIRS = \
int/channel int/arithmetic int/linear int/bool int/branch int/exec \
int/element int/sequence int/bin-packing \
int/unary int/cumulative int/cumulatives int/task \
int/ldsb int/distinct int/trace
int/ldsb int/distinct int/trace int/order

#
# FLOAT COMPONENTS
Expand Down Expand Up @@ -879,7 +881,7 @@ INTEXAMPLESRC0 = \
word-square crossword open-shop car-sequencing sat \
bin-packing knights tsp perfect-square schurs-lemma \
dominating-queens colored-matrix multi-bin-packing \
qcp
qcp job-shop


INTEXAMPLEHDR = $(INTEXAMPLEHDR0:%=examples/%.hpp)
Expand Down Expand Up @@ -1081,7 +1083,7 @@ INTTESTSRC00 = \
channel arithmetic basic bool count dom distinct element extensional \
rel linear gcc sorted unshare exec sequence \
mm-arithmetic mm-bool mm-lin mm-count mm-rel \
bin-packing unary cumulative cumulatives circuit \
bin-packing order unary cumulative cumulatives circuit \
no-overlap precede nvalues member
INTTESTSRC0 = test/int.cpp $(INTTESTSRC00:%=test/int/%.cpp)
INTTESTOBJ = $(INTTESTSRC0:%.cpp=%$(OBJSUFFIX))
Expand Down
14 changes: 14 additions & 0 deletions changelog.in
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@ Date: 2019-??-??
[DESCRIPTION]
Let's see.

[ENTRY]
Module: example
What: new
Rank: minor
[DESCRIPTION]
Added job-shop scheduling example.

[ENTRY]
Module: int
What: new
Rank: minor
[DESCRIPTION]
Added order constraint for two unary scheduling tasks.

[ENTRY]
Module: flatzinc
What: new
Expand Down
Loading

0 comments on commit c85453c

Please sign in to comment.