From 007f2b597876dd9e0cd4f2ea2610b5e8e267c523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Tue, 21 Nov 2017 01:23:59 +0100 Subject: [PATCH] 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. --- configurations.yml | 66 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/configurations.yml b/configurations.yml index 2b33f9d96..b788d55db 100644 --- a/configurations.yml +++ b/configurations.yml @@ -33,6 +33,8 @@ options: - "--parallel=5" shallow: &shallow - "--shallow" + t0: &t0 + - "-T 0" heuristics: &heuristics - "--heuristic=Domain" - "heuristic.lp" @@ -54,58 +56,70 @@ configurations: options: [*basics, *madagascarMpC] instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"] -- id: "fd-ps-e3" - options: [*basics, *fastDownwardPreprocessing, *plannerSequential, *encoding3] +- id: "fd-ps-e1-sh" + options: [*basics, *fastDownwardPreprocessing, *plannerSequential, *encoding1, *shallow] instanceSets: ["lpnmr-hard-instances"] -- id: "fd-pa-e3" - options: [*basics, *fastDownwardPreprocessing, *plannerA, *encoding3] +- id: "fd-pa-e1-sh" + options: [*basics, *fastDownwardPreprocessing, *plannerA, *encoding1, *shallow] instanceSets: ["lpnmr-hard-instances"] -- id: "fd-pb-e0" - options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding0] +- id: "fd-pb-e0-sh" + options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding0, *shallow] instanceSets: ["lpnmr-hard-instances"] -- id: "fd-pb-e1" - options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding1] +- id: "fd-pb-e1-sh" + options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding1, *shallow] instanceSets: ["lpnmr-hard-instances"] - id: "fd-pb-e2" options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding2] instanceSets: ["lpnmr-hard-instances"] - id: "fd-pb-e3" 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"] +- 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" options: [*basics, *fastDownwardPreprocessing, *plannerB, *encoding4] instanceSets: ["lpnmr-hard-instances"] -- id: "fd-pc-e3" - options: [*basics, *fastDownwardPreprocessing, *plannerC, *encoding3] +- id: "fd-pb-es" + options: [*basics, *fastDownwardPreprocessing, *plannerB, *encodingSequential] + instanceSets: ["lpnmr-hard-instances"] +- id: "fd-pc-e1-sh" + options: [*basics, *fastDownwardPreprocessing, *plannerC, *encoding1, *shallow] instanceSets: ["lpnmr-hard-instances"] -- id: "ps-e3" - options: [*basics, *plannerSequential, *encoding3] +- id: "ps-e1-sh" + options: [*basics, *plannerSequential, *encoding1, *shallow] instanceSets: ["lpnmr-easy-instances"] -- id: "pa-e3" - options: [*basics, *plannerA, *encoding3] +- id: "pa-e1-sh" + options: [*basics, *plannerA, *encoding1, *shallow] instanceSets: ["lpnmr-easy-instances"] -- id: "pb-e0" - options: [*basics, *plannerB, *encoding0] +- id: "pb-e0-sh" + options: [*basics, *plannerB, *encoding0, *shallow] instanceSets: ["lpnmr-easy-instances"] -- id: "pb-e1" - options: [*basics, *plannerB, *encoding1] +- id: "pb-e1-sh" + options: [*basics, *plannerB, *encoding1, *shallow] instanceSets: ["lpnmr-easy-instances"] - id: "pb-e2" options: [*basics, *plannerB, *encoding2] instanceSets: ["lpnmr-easy-instances"] - id: "pb-e3" options: [*basics, *plannerB, *encoding3] - instanceSets: ["lpnmr-easy-instances", "lpnmr-hard-instances"] -- id: "pb-e3-h" - options: [*basics, *plannerB, *encoding3, *heuristics] 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" options: [*basics, *plannerB, *encoding4] instanceSets: ["lpnmr-easy-instances"] -- id: "pc-e3" - options: [*basics, *plannerC, *encoding3] +- id: "pb-es" + options: [*basics, *plannerB, *encodingSequential] + instanceSets: ["lpnmr-easy-instances"] +- id: "pc-e1-sh" + options: [*basics, *plannerC, *encoding1, *shallow] instanceSets: ["lpnmr-easy-instances"]