Skip to content

Commit

Permalink
Change the jobshop instances used when unit testing
Browse files Browse the repository at this point in the history
  • Loading branch information
AllenZzw authored and Dekker1 committed Aug 29, 2024
1 parent 53c967d commit b66f02a
Show file tree
Hide file tree
Showing 7 changed files with 214 additions and 80 deletions.
77 changes: 0 additions & 77 deletions crates/fzn-huub/corpus/jobshop.fzn.json

This file was deleted.

2 changes: 0 additions & 2 deletions crates/fzn-huub/corpus/jobshop.sol

This file was deleted.

71 changes: 71 additions & 0 deletions crates/fzn-huub/corpus/jobshop_la04.fzn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"variables": {
"X_INTRODUCED_17_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_18_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_19_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_20_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_21_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_22_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_23_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_24_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_25_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_26_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_27_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_28_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_29_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_30_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_31_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_32_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_33_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_34_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_35_" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_36_" : { "type" : "int", "domain" : [[0, 3000]] },
"objective" : { "type" : "int", "domain" : [[0, 3000]] },
"X_INTRODUCED_66_" : { "type" : "int", "domain" : [[7, 3007]], "introduced": true, "defined" : true },
"X_INTRODUCED_67_" : { "type" : "int", "domain" : [[53, 3053]], "introduced": true, "defined" : true },
"X_INTRODUCED_68_" : { "type" : "int", "domain" : [[52, 3052]], "introduced": true, "defined" : true },
"X_INTRODUCED_69_" : { "type" : "int", "domain" : [[90, 3090]], "introduced": true, "defined" : true }
},
"arrays": {
"X_INTRODUCED_40_" : { "a": [1, -1] },
"start" : { "a": ["X_INTRODUCED_17_", "X_INTRODUCED_18_", "X_INTRODUCED_19_", "X_INTRODUCED_20_", "X_INTRODUCED_21_", "X_INTRODUCED_22_", "X_INTRODUCED_23_", "X_INTRODUCED_24_", "X_INTRODUCED_25_", "X_INTRODUCED_26_", "X_INTRODUCED_27_", "X_INTRODUCED_28_", "X_INTRODUCED_29_", "X_INTRODUCED_30_", "X_INTRODUCED_31_", "X_INTRODUCED_32_", "X_INTRODUCED_33_", "X_INTRODUCED_34_", "X_INTRODUCED_35_", "X_INTRODUCED_36_"] },
"X_INTRODUCED_57_" : { "a": ["X_INTRODUCED_17_", "X_INTRODUCED_24_", "X_INTRODUCED_29_", "X_INTRODUCED_34_"] },
"X_INTRODUCED_59_" : { "a": ["X_INTRODUCED_21_", "X_INTRODUCED_26_", "X_INTRODUCED_27_", "X_INTRODUCED_35_"] },
"X_INTRODUCED_61_" : { "a": ["X_INTRODUCED_18_", "X_INTRODUCED_23_", "X_INTRODUCED_31_", "X_INTRODUCED_32_"] },
"X_INTRODUCED_63_" : { "a": ["X_INTRODUCED_19_", "X_INTRODUCED_22_", "X_INTRODUCED_28_", "X_INTRODUCED_36_"] },
"X_INTRODUCED_65_" : { "a": ["X_INTRODUCED_20_", "X_INTRODUCED_25_", "X_INTRODUCED_30_", "X_INTRODUCED_33_"] },
"X_INTRODUCED_70_" : { "a": ["X_INTRODUCED_66_", "X_INTRODUCED_67_", "X_INTRODUCED_68_", "X_INTRODUCED_69_"] },
"X_INTRODUCED_71_" : { "a": ["X_INTRODUCED_17_", "X_INTRODUCED_18_", "X_INTRODUCED_19_", "X_INTRODUCED_20_", "X_INTRODUCED_21_", "X_INTRODUCED_22_", "X_INTRODUCED_23_", "X_INTRODUCED_24_", "X_INTRODUCED_25_", "X_INTRODUCED_26_", "X_INTRODUCED_27_", "X_INTRODUCED_28_", "X_INTRODUCED_29_", "X_INTRODUCED_30_", "X_INTRODUCED_31_", "X_INTRODUCED_32_", "X_INTRODUCED_33_", "X_INTRODUCED_34_", "X_INTRODUCED_35_", "X_INTRODUCED_36_"] }
},
"constraints": [
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_17_", "X_INTRODUCED_18_"], -12]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_18_", "X_INTRODUCED_19_"], -94]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_19_", "X_INTRODUCED_20_"], -92]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_20_", "X_INTRODUCED_21_"], -91]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_22_", "X_INTRODUCED_23_"], -77]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_23_", "X_INTRODUCED_24_"], -20]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_24_", "X_INTRODUCED_25_"], -76]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_25_", "X_INTRODUCED_26_"], -88]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_27_", "X_INTRODUCED_28_"], -88]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_28_", "X_INTRODUCED_29_"], -69]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_29_", "X_INTRODUCED_30_"], -62]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_30_", "X_INTRODUCED_31_"], -98]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_32_", "X_INTRODUCED_33_"], -61]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_33_", "X_INTRODUCED_34_"], -9]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_34_", "X_INTRODUCED_35_"], -62]},
{ "id" : "int_lin_le", "args" : ["X_INTRODUCED_40_", ["X_INTRODUCED_35_", "X_INTRODUCED_36_"], -52]},
{ "id" : "huub_disjunctive_strict", "args" : ["X_INTRODUCED_57_", [12, 76, 62, 62]]},
{ "id" : "huub_disjunctive_strict", "args" : ["X_INTRODUCED_59_", [7, 53, 88, 52]]},
{ "id" : "huub_disjunctive_strict", "args" : ["X_INTRODUCED_61_", [94, 20, 52, 61]]},
{ "id" : "huub_disjunctive_strict", "args" : ["X_INTRODUCED_63_", [92, 77, 69, 90]]},
{ "id" : "huub_disjunctive_strict", "args" : ["X_INTRODUCED_65_", [91, 88, 98, 9]]},
{ "id" : "huub_array_int_maximum", "args" : ["objective", "X_INTRODUCED_70_"]},
{ "id" : "int_lin_eq", "args" : [[1, -1], ["X_INTRODUCED_21_", "X_INTRODUCED_66_"], -7], "defines" : "X_INTRODUCED_66_"},
{ "id" : "int_lin_eq", "args" : [[1, -1], ["X_INTRODUCED_26_", "X_INTRODUCED_67_"], -53], "defines" : "X_INTRODUCED_67_"},
{ "id" : "int_lin_eq", "args" : [[1, -1], ["X_INTRODUCED_31_", "X_INTRODUCED_68_"], -52], "defines" : "X_INTRODUCED_68_"},
{ "id" : "int_lin_eq", "args" : [[1, -1], ["X_INTRODUCED_36_", "X_INTRODUCED_69_"], -90], "defines" : "X_INTRODUCED_69_"}
],
"output": ["objective", "start"],
"solve": { "method" : "minimize", "objective" : "objective", "ann" : [{ "id" : "int_search", "args" : ["X_INTRODUCED_71_", "smallest", "indomain_min", "complete"]}] },
"version": "1.0"
}
2 changes: 2 additions & 0 deletions crates/fzn-huub/corpus/jobshop_la04.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
objective = 457;
start = [0,97,191,359,450,0,77,97,173,261,0,88,173,261,359,0,61,235,314,366];
Loading

0 comments on commit b66f02a

Please sign in to comment.