Skip to content

Commit

Permalink
Simple update of the format of some execution commands
Browse files Browse the repository at this point in the history
  • Loading branch information
lecoutre committed Aug 2, 2024
1 parent 9b970f3 commit 6b391c1
Show file tree
Hide file tree
Showing 37 changed files with 82 additions and 68 deletions.
4 changes: 2 additions & 2 deletions academic/AllInterval/AllInterval.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
constraints: AllDifferent
## Execution
- python AllInterval.py -data=number [-solve]
- python AllInterval.py -data=number -variant=aux [-solve]
python AllInterval.py -data=number [-solve]
python AllInterval.py -data=number -variant=aux [-solve]
## Tags
academic, notebook
Expand Down
4 changes: 2 additions & 2 deletions academic/BIBD/BIBD.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
constraints: Lex, Sum
## Execution
- python BIBD.py -data=[number,number,number,number,number]
- python BIBD.py -data=[number,number,number,number,number] -variant=aux
python BIBD.py -data=[number,number,number,number,number]
python BIBD.py -data=[number,number,number,number,number] -variant=aux
## Tags
academic, notebook, csplib
Expand Down
2 changes: 1 addition & 1 deletion academic/BoardColoration/BoardColoration.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
constraints: Maximum, NValues, Lex
## Execution
- python BoardColoration.py -data=[number,number]
python BoardColoration.py -data=[number,number]
## Tags
academic, notebook
Expand Down
4 changes: 2 additions & 2 deletions academic/ChangeMaking/ChangeMaking.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
constraints: Sum
## Execution
- python ChangeMaking.py -data=number
- python ChangeMaking.py -data=number -variant=compact
python ChangeMaking.py -data=number
python ChangeMaking.py -data=number -variant=compact
## Links
- https://en.wikipedia.org/wiki/Change-making_problem
Expand Down
2 changes: 1 addition & 1 deletion academic/ClockTriplet/ClockTriplet.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
constraints: AllDifferent, Slide, Sum
## Execution
- python ClockTriplet.py -data=[number,number]
python ClockTriplet.py -data=[number,number]
## Links
- http://www.f1compiler.com/samples/Dean%20Clark%27s%20Problem.f1.html
Expand Down
2 changes: 1 addition & 1 deletion academic/CoinsGrid/CoinsGrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
constraints: Sum
## Execution
- python CoinsGrid.py -data=[number,number]
python CoinsGrid.py -data=[number,number]
## Links
- https://link.springer.com/book/10.1007/978-3-319-25883-6
Expand Down
2 changes: 1 addition & 1 deletion academic/ColouredQueens/ColouredQueens.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
constraints: AllDifferent
## Execution
- python ColouredQueens.py -data=number
python ColouredQueens.py -data=number
## Links
- https://link.springer.com/chapter/10.1007/978-3-540-30210-0_17
Expand Down
4 changes: 2 additions & 2 deletions academic/CookieMonster/CookieMonster.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
constraints: Element
## Execution
- python CookieMonster.py
- python CookieMonster.py -data=cookies_example.json
python CookieMonster.py
python CookieMonster.py -data=cookies_example.json
## Links
- https://bitbucket.org/oscarlib/oscar/src/dev/oscar-cp-examples/src/main/scala/oscar/cp/examples/CookieMonster.scala
Expand Down
2 changes: 1 addition & 1 deletion academic/CostasArray/CostasArray.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
constraints: AllDifferent
## Execution
- python CostasArray.py -data=number
python CostasArray.py -data=number
## Links
- https://en.wikipedia.org/wiki/Costas_array
Expand Down
2 changes: 1 addition & 1 deletion academic/CoveringArray/CoveringArray.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
constraints: AllDifferent, Channel, Table
## Execution
- python CoveringArray.py -data=[number,number,number,number]
python CoveringArray.py -data=[number,number,number,number]
## Links
- https://www.csplib.org/Problems/prob045/
Expand Down
4 changes: 2 additions & 2 deletions academic/CryptoPuzzle/CryptoPuzzle.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
constraints: AllDifferent, Sum
## Execution
- python CryptoPuzzle.py -data=[string,string,string]
- python CryptoPuzzle.py -data=[string,string,string] -variant=carry
python CryptoPuzzle.py -data=[string,string,string]
python CryptoPuzzle.py -data=[string,string,string] -variant=carry
## Links
- https://en.wikipedia.org/wiki/Verbal_arithmetic
Expand Down
2 changes: 1 addition & 1 deletion academic/DiamondFree/DiamondFree.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
constraints: Lex, Sum
## Execution
- python DiamondFree.py -data=[number]
python DiamondFree.py -data=[number]
## Links
- https://www.csplib.org/Problems/prob050/
Expand Down
6 changes: 3 additions & 3 deletions academic/GolombRuler/GolombRuler.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
constraints: AllDifferent, Maximum
## Execution
- python GolombRuler.py -data=number
- python GolombRuler.py -data=number -variant=dec
- python GolombRuler.py -data=number -variant=aux
python GolombRuler.py -data=number
python GolombRuler.py -data=number -variant=dec
python GolombRuler.py -data=number -variant=aux
## Links
- https://www.csplib.org/Problems/prob006/
Expand Down
2 changes: 1 addition & 1 deletion academic/GracefulGraph/GracefulGraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
constraints: AllDifferent
## Execution
- python GracefulGraph.py -data=[number,number]
python GracefulGraph.py -data=[number,number]
### Links
- https://www.csplib.org/Problems/prob053
Expand Down
2 changes: 1 addition & 1 deletion academic/Hadamard/Hadamard.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
constraints: Sum
## Execution
- python Hadamard.py -data=number
python Hadamard.py -data=number
## Links
- https://www.csplib.org/Problems/prob084/
Expand Down
6 changes: 3 additions & 3 deletions academic/KnightTour/KnightTour.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
constraints: AllDifferent, Table
## Execution
- python KnightTour.py -data=number
- python KnightTour.py -data=number -variant=table-2
- python KnightTour.py -data=number -variant=table-3
python KnightTour.py -data=number
python KnightTour.py -data=number -variant=table-2
python KnightTour.py -data=number -variant=table-3
## Links
- https://en.wikipedia.org/wiki/Knight%27s_tour
Expand Down
2 changes: 1 addition & 1 deletion academic/LowAutocorrelation/LowAutocorrelation.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
constraints: Sum
## Execution
- python LowAutocorrelation.py -data=number
python LowAutocorrelation.py -data=number
## Tags
academic, csplib
Expand Down
4 changes: 2 additions & 2 deletions academic/NonTransitiveDice/NonTransitiveDice.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
constraints: Maximum, Sum
## Execution
- python NonTransitiveDice.py -data=[number,number,number]
- python NonTransitiveDice.py -data=[number,number,number] -variant=opt
python NonTransitiveDice.py -data=[number,number,number]
python NonTransitiveDice.py -data=[number,number,number] -variant=opt
## Links
- https://en.wikipedia.org/wiki/Intransitive_dice
Expand Down
2 changes: 1 addition & 1 deletion academic/NumberPartitioning/NumberPartitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
constraints: AllDifferent, Sum
## Execution
- python NumberPartitioning.py -data=number
python NumberPartitioning.py -data=number
## Links
- https://www.csplib.org/Problems/prob049/
Expand Down
2 changes: 1 addition & 1 deletion academic/Ortholatin/Ortholatin.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
constraints: AllDifferent, Table
## Execution
- python Ortholatin.py -data=number
python Ortholatin.py -data=number
## Links
- https://en.wikipedia.org/wiki/Mutually_orthogonal_Latin_squares
Expand Down
4 changes: 2 additions & 2 deletions academic/PeacableArmies/PeacableArmies.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
constraints: Count, Sum
## Execution
- python PeacableArmies.py -data=number -variant=m1
- python PeacableArmies.py -data=number -variant=m2
python PeacableArmies.py -data=number -variant=m1
python PeacableArmies.py -data=number -variant=m2
## Tags
academic, csplib
Expand Down
2 changes: 1 addition & 1 deletion academic/PegSolitaire/PegSolitaire.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Here, the model is for the English style (standard), with 33 holes.
## Execution
- python PegSolitaire.py -data=[number,number,number] -variant=english
python PegSolitaire.py -data=[number,number,number] -variant=english
## Links
- https://www.cs.york.ac.uk/aig/projects/implied/docs/CPAIOR03.pdf
Expand Down
2 changes: 1 addition & 1 deletion academic/PythagoreanTriples/PythagoreanTriples.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
constraints: NValues
## Execution
- python PythagoreanTriples.py -data=number
python PythagoreanTriples.py -data=number
## Links
- https://en.wikipedia.org/wiki/Boolean_Pythagorean_triples_problem
Expand Down
18 changes: 9 additions & 9 deletions academic/QuasiGroup/QuasiGroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
constraints: Element
## Execution
- python QuasiGroup.py -variant=base-v3 -data=number
- python QuasiGroup.py -variant=base-v4 -data=number
- python QuasiGroup.py -variant=base-v5 -data=number
- python QuasiGroup.py -variant=base-v6 -data=number
- python QuasiGroup.py -variant=base-v7 -data=number
- python QuasiGroup.py -variant=aux-v3 -data=number
- python QuasiGroup.py -variant=aux-v4 -data=number
- python QuasiGroup.py -variant=aux-v5 -data=number
- python QuasiGroup.py -variant=aux-v7 -data=number
python QuasiGroup.py -variant=base-v3 -data=number
python QuasiGroup.py -variant=base-v4 -data=number
python QuasiGroup.py -variant=base-v5 -data=number
python QuasiGroup.py -variant=base-v6 -data=number
python QuasiGroup.py -variant=base-v7 -data=number
python QuasiGroup.py -variant=aux-v3 -data=number
python QuasiGroup.py -variant=aux-v4 -data=number
python QuasiGroup.py -variant=aux-v5 -data=number
python QuasiGroup.py -variant=aux-v7 -data=number
## Links
- https://www.csplib.org/Problems/prob003/
Expand Down
10 changes: 5 additions & 5 deletions academic/QueenAttacking/QueenAttacking.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
constraints: AllDifferent, Sum, Table
## Execution
- python QueenAttacking.py
- python QueenAttacking.py -data=number
- python QueenAttacking.py -data=number -variant=aux
- python QueenAttacking.py -data=number -variant=hybrid
- python QueenAttacking.py -data=number -variant=table
python QueenAttacking.py
python QueenAttacking.py -data=number
python QueenAttacking.py -data=number -variant=aux
python QueenAttacking.py -data=number -variant=hybrid
python QueenAttacking.py -data=number -variant=table
## Tags
academic, csplib
Expand Down
6 changes: 3 additions & 3 deletions academic/Queens/Queens.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
constraints: AllDifferent
## Execution
- python Queens.py -data=number
- python Queens.py -data=number -variant=v1
- python Queens.py -data=number -variant=v2
python Queens.py -data=number
python Queens.py -data=number -variant=v1
python Queens.py -data=number -variant=v2
## Tags
academic, notebook, csplib
Expand Down
2 changes: 1 addition & 1 deletion academic/QueensKnights/QueensKnights.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
constraints: AllDifferent
## Execution
- python QueensKnights.py -data=[number,number]
python QueensKnights.py -data=[number,number]
## Links
- https://dblp.org/rec/conf/ecai/BoussemartHLS04.html
Expand Down
2 changes: 1 addition & 1 deletion academic/Ramsey/Ramsey.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
constraints: Maximum, NValues
## Execution
- python Ramsey.py -data=number
python Ramsey.py -data=number
## Tags
academic, csplib
Expand Down
4 changes: 2 additions & 2 deletions academic/SchurrLemma/SchurrLemma.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
constraints: AllDifferent, NValues
## Execution
- python SchurrLemma.py -data=[number,number]
- python SchurrLemma.py -data=[number,number] -variant=mod
python SchurrLemma.py -data=[number,number]
python SchurrLemma.py -data=[number,number] -variant=mod
## Tags
academic, csplib
Expand Down
4 changes: 2 additions & 2 deletions academic/SocialGolfers/SocialGolfers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
constraints: Cardinality, Lex, Sum
## Execution
- python SocialGolfers.py -data=[number,number,number]
- python SocialGolfers.py -data=[number,number,number] -variant=cnt
python SocialGolfers.py -data=[number,number,number]
python SocialGolfers.py -data=[number,number,number] -variant=cnt
## Links
- https://en.wikipedia.org/wiki/Social_golfer_problem
Expand Down
2 changes: 1 addition & 1 deletion academic/SocialGolfers/SocialGolfers01.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
constraints: Cardinality, Lex, Sum
## Execution
- python SocialGolfers01.py -data=[number,number,number]
python SocialGolfers01.py -data=[number,number,number]
## Tags
academic, csplib
Expand Down
4 changes: 2 additions & 2 deletions academic/SportsScheduling/SportsScheduling.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
constraints: AllDifferent, Cardinality, Count, Table
## Execution
- python SportsScheduling.py -data=number
- python SportsScheduling.py -data=number -variant=dummy
python SportsScheduling.py -data=number
python SportsScheduling.py -data=number -variant=dummy
## Links
- https://www.csplib.org/Problems/prob026/
Expand Down
4 changes: 2 additions & 2 deletions academic/Superpermutation/Superpermutation.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
constraints: AllDifferent, Cardinality, Table
## Execution
- python Superpermutation.py -data=number
- python Superpermutation.py -data=number -variant=table
python Superpermutation.py -data=number
python Superpermutation.py -data=number -variant=table
## Links
- https://en.wikipedia.org/wiki/Superpermutation
Expand Down
4 changes: 2 additions & 2 deletions academic/WarOrPeace/WarOrPeace.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
constraints: Sum
## Execution
- python WarOrPeace.py -data=number
- python WarOrPeace.py -data=number -variant=or
python WarOrPeace.py -data=number
python WarOrPeace.py -data=number -variant=or
## Links
- https://oeis.org/A002620
Expand Down
18 changes: 16 additions & 2 deletions realistic/FlexibleJobshop/easy01.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
{
"nMachines": 4,
"tasks": [[0, 1, 2], [3, 4, 5], [6, 7, 8]],
"optionalTasks": [[0, 1], [2, 3], [4, 5], [6, 7], [8, 9], [10, 11], [12, 13], [14, 15], [16, 17]],
"tasks": [
[0, 1, 2],
[3, 4, 5],
[6, 7, 8]
],
"optionalTasks": [
[0, 1],
[2, 3],
[4, 5],
[6, 7],
[8, 9],
[10, 11],
[12, 13],
[14, 15],
[16, 17]
],
"machines": [0, 1, 1, 3, 2, 3, 0, 2, 1, 3, 2, 3, 0, 1, 1, 2, 2, 3],
"durations": [17, 25, 30, 40, 160, 150, 30, 50, 66, 55, 65, 78, 56, 62, 70, 80, 100, 90]
}
2 changes: 1 addition & 1 deletion realistic/Gametes/Gametes.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,5 @@
)

"""
1) symmetry-breaking constraint are very long to generate. What to do?
1) Symmetry-breaking constraint are very long to generate. What to do?
"""
Loading

0 comments on commit 6b391c1

Please sign in to comment.