Skip to content

Commit c85453c

Browse files
authored
Develop (#46)
* Added order propagator for scheduling * Added Job-Shop scheduling example
1 parent d34425b commit c85453c

File tree

10 files changed

+7187
-3
lines changed

10 files changed

+7187
-3
lines changed

Makefile.dep

Lines changed: 318 additions & 0 deletions
Large diffs are not rendered by default.

Makefile.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ INTSRC0 = \
325325
unshare.cpp sequence.cpp \
326326
bin-packing.cpp bin-packing/propagate.cpp \
327327
bin-packing/conflict-graph.cpp \
328+
order.cpp order/propagate.cpp \
328329
unary.cpp cumulative.cpp cumulatives.cpp \
329330
circuit.cpp no-overlap.cpp nvalues.cpp \
330331
member.cpp branch/action.cpp branch/chb.cpp \
@@ -398,6 +399,7 @@ INTHDR0 = \
398399
task.hh task/fwd-to-bwd.hpp task/array.hpp task/sort.hpp \
399400
task/iter.hpp task/tree.hpp task/purge.hpp task/prop.hpp \
400401
task/man-to-opt.hpp task/event.hpp \
402+
order.hh order/propagate.hpp \
401403
unary.hh unary/task.hpp unary/task-view.hpp \
402404
unary/tree.hpp unary/overload.hpp unary/detectable.hpp \
403405
unary/time-tabling.hpp unary/not-first-not-last.hpp \
@@ -462,7 +464,7 @@ INTBUILDDIRS = \
462464
int/channel int/arithmetic int/linear int/bool int/branch int/exec \
463465
int/element int/sequence int/bin-packing \
464466
int/unary int/cumulative int/cumulatives int/task \
465-
int/ldsb int/distinct int/trace
467+
int/ldsb int/distinct int/trace int/order
466468

467469
#
468470
# FLOAT COMPONENTS
@@ -879,7 +881,7 @@ INTEXAMPLESRC0 = \
879881
word-square crossword open-shop car-sequencing sat \
880882
bin-packing knights tsp perfect-square schurs-lemma \
881883
dominating-queens colored-matrix multi-bin-packing \
882-
qcp
884+
qcp job-shop
883885

884886

885887
INTEXAMPLEHDR = $(INTEXAMPLEHDR0:%=examples/%.hpp)
@@ -1081,7 +1083,7 @@ INTTESTSRC00 = \
10811083
channel arithmetic basic bool count dom distinct element extensional \
10821084
rel linear gcc sorted unshare exec sequence \
10831085
mm-arithmetic mm-bool mm-lin mm-count mm-rel \
1084-
bin-packing unary cumulative cumulatives circuit \
1086+
bin-packing order unary cumulative cumulatives circuit \
10851087
no-overlap precede nvalues member
10861088
INTTESTSRC0 = test/int.cpp $(INTTESTSRC00:%=test/int/%.cpp)
10871089
INTTESTOBJ = $(INTTESTSRC0:%.cpp=%$(OBJSUFFIX))

changelog.in

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@ Date: 2019-??-??
6868
[DESCRIPTION]
6969
Let's see.
7070

71+
[ENTRY]
72+
Module: example
73+
What: new
74+
Rank: minor
75+
[DESCRIPTION]
76+
Added job-shop scheduling example.
77+
78+
[ENTRY]
79+
Module: int
80+
What: new
81+
Rank: minor
82+
[DESCRIPTION]
83+
Added order constraint for two unary scheduling tasks.
84+
7185
[ENTRY]
7286
Module: flatzinc
7387
What: new

0 commit comments

Comments
 (0)