Add configurations with --shallow

This adds new configurations with --shallow requested by Martin and
Javier as well as the missing configurations with the sequential
encoding.
This commit is contained in:
Patrick Lühne 2017-11-21 01:23:59 +01:00
parent 7c23d23fec
commit 007f2b5978
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF

View File

@ -33,6 +33,8 @@ options:
- "--parallel=5" - "--parallel=5"
shallow: &shallow shallow: &shallow
- "--shallow" - "--shallow"
t0: &t0
- "-T 0"
heuristics: &heuristics heuristics: &heuristics
- "--heuristic=Domain" - "--heuristic=Domain"
- "heuristic.lp" - "heuristic.lp"
@ -54,58 +56,70 @@ configurations:
options: [*basics, *madagascarMpC] options: [*basics, *madagascarMpC]
instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"] instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"]
- id: "fd-ps-e3" - id: "fd-ps-e1-sh"
options: [*basics, *fastDownwardPreprocessing, *plannerSequential, *encoding3] options: [*basics, *fastDownwardPreprocessing, *plannerSequential, *encoding1, *shallow]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pa-e3" - id: "fd-pa-e1-sh"
options: [*basics, *fastDownwardPreprocessing, *plannerA, *encoding3] options: [*basics, *fastDownwardPreprocessing, *plannerA, *encoding1, *shallow]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e0" - id: "fd-pb-e0-sh"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding0] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding0, *shallow]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e1" - id: "fd-pb-e1-sh"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding1] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding1, *shallow]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e2" - id: "fd-pb-e2"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding2] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding2]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e3" - id: "fd-pb-e3"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding3] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding3]
instanceSets: ["lpnmr-hard-instances", "lpnmr-easy-instances"]
- id: "fd-pb-e3-h"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding3, *heuristics]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e3-t0"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding3, *t0]
instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pb-e1-sh-h"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding1, *shallow, *heuristics]
instanceSets: ["lpnmr-hard-instances", "lpnmr-easy-instances"]
- id: "fd-pb-e4" - id: "fd-pb-e4"
options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding4] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding4]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pc-e3" - id: "fd-pb-es"
options: [*basics, *fastDownwardPreprocessing, *plannerC, *encoding3] options: [*basics, *fastDownwardPreprocessing, *plannerB, *encodingSequential]
instanceSets: ["lpnmr-hard-instances"]
- id: "fd-pc-e1-sh"
options: [*basics, *fastDownwardPreprocessing, *plannerC, *encoding1, *shallow]
instanceSets: ["lpnmr-hard-instances"] instanceSets: ["lpnmr-hard-instances"]
- id: "ps-e3" - id: "ps-e1-sh"
options: [*basics, *plannerSequential, *encoding3] options: [*basics, *plannerSequential, *encoding1, *shallow]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pa-e3" - id: "pa-e1-sh"
options: [*basics, *plannerA, *encoding3] options: [*basics, *plannerA, *encoding1, *shallow]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e0" - id: "pb-e0-sh"
options: [*basics, *plannerB, *encoding0] options: [*basics, *plannerB, *encoding0, *shallow]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e1" - id: "pb-e1-sh"
options: [*basics, *plannerB, *encoding1] options: [*basics, *plannerB, *encoding1, *shallow]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e2" - id: "pb-e2"
options: [*basics, *plannerB, *encoding2] options: [*basics, *plannerB, *encoding2]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e3" - id: "pb-e3"
options: [*basics, *plannerB, *encoding3] options: [*basics, *plannerB, *encoding3]
instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"]
- id: "pb-e3-h"
options: [*basics, *plannerB, *encoding3, *heuristics]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e3-t0"
options: [*basics, *plannerB, *encoding3, *t0]
instanceSets: ["lpnmr-easy-instances"]
- id: "pb-e1-sh-h"
options: [*basics, *plannerB, *encoding1, *shallow, *heuristics]
instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"]
- id: "pb-e4" - id: "pb-e4"
options: [*basics, *plannerB, *encoding4] options: [*basics, *plannerB, *encoding4]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]
- id: "pc-e3" - id: "pb-es"
options: [*basics, *plannerC, *encoding3] options: [*basics, *plannerB, *encodingSequential]
instanceSets: ["lpnmr-easy-instances"]
- id: "pc-e1-sh"
options: [*basics, *plannerC, *encoding1, *shallow]
instanceSets: ["lpnmr-easy-instances"] instanceSets: ["lpnmr-easy-instances"]