diff --git a/jastadd-mquat-benchmark/src/main/resources/scenarios.json b/jastadd-mquat-benchmark/src/main/resources/scenarios.json index e9163b0d186054d7c07d36da5786ab42521065c5..62155d140af40acdc83d67a2e28489b2abac452a 100644 --- a/jastadd-mquat-benchmark/src/main/resources/scenarios.json +++ b/jastadd-mquat-benchmark/src/main/resources/scenarios.json @@ -2,32 +2,29 @@ "path": "results", "logLevel": "info", "solvers": [ - "aco", - "emfer", "ilp-direct", -// "ilp-external", - "random", - "genetic", + "genetic_SPEA2", + "genetic_NSGA2", "simple" ], - "timeoutValue": 15, + "timeoutValue": 5, "timeoutUnit": "MINUTES", "seed": 0, "sandBoxed": true, -// "repetitions": 10, + "repetitions": 20, "scenarios": [ - { "id": 0, "name": "trivial", "variants": 1, "requests": 1, "depth": 1, "resources": 1 }, - { "id": 1, "name": "small", "variants": 2, "requests": 1, "depth": 2, "resources": 1.5 }, - { "id": 2, "name": "small-many-hw", "variants": 2, "requests": 1, "depth": 2, "resources": 5 }, - { "id": 3, "name": "small-complex-sw", "variants": 2, "requests": 1, "depth": 5, "resources": 1.5 }, - { "id": 4, "name": "medium", "variants": 10, "requests": 15, "depth": 2, "resources": 1.5 }, - { "id": 5, "name": "medium-many-hw", "variants": 10, "requests": 15, "depth": 2, "resources": 5 }, - { "id": 6, "name": "medium-complex-sw", "variants": 5, "requests": 10, "depth": 5, "resources": 1.5 }, - { "id": 7, "name": "large", "variants": 20, "requests": 20, "depth": 2, "resources": 1.5 }, - { "id": 8, "name": "large-many-hw", "variants": 20, "requests": 20, "depth": 2, "resources": 5 }, - { "id": 9, "name": "large-complex-sw", "variants": 10, "requests": 20, "depth": 5, "resources": 1.5 }, - { "id": 10, "name": "huge", "variants": 50, "requests": 50, "depth": 2, "resources": 1.5 }, - { "id": 11, "name": "huge-many-hw", "variants": 50, "requests": 50, "depth": 2, "resources": 5 }, - { "id": 12, "name": "huge-complex-sw", "variants": 20, "requests": 50, "depth": 5, "resources": 1.5 } + { "id": 1, "name": "small", "variants": 2, "requests": 1, "depth": 2, "resources": 1.5 }, + + { "id": 2, "name": "small-medium-hw", "variants": 2, "requests": 1, "depth": 2, "resources": 3.0 }, + { "id": 3, "name": "small-complex-hw", "variants": 2, "requests": 1, "depth": 2, "resources": 5.0 }, + + { "id": 6, "name": "small-medium-var", "variants": 4, "requests": 1, "depth": 2, "resources": 1.5 }, + { "id": 5, "name": "small-complex-var", "variants": 8, "requests": 1, "depth": 2, "resources": 1.5 }, + + { "id": 2, "name": "small-medium-rq", "variants": 2, "requests": 2, "depth": 2, "resources": 1.5 }, + { "id": 3, "name": "small-complex-rq", "variants": 2, "requests": 4, "depth": 2, "resources": 1.5 }, + + { "id": 2, "name": "small-medium-sw", "variants": 2, "requests": 1, "depth": 3, "resources": 1.5 }, + { "id": 3, "name": "small-complex-sw", "variants": 2, "requests": 1, "depth": 4, "resources": 1.5 } ] -} +} \ No newline at end of file