From ced89f12d5a5bf72168eb9a70d915ff8683a8b71 Mon Sep 17 00:00:00 2001
From: Silvan Sievers <silvan.sievers@unibas.ch>
Date: Wed, 18 Aug 2021 15:30:30 +0200
Subject: [PATCH 1/3] [issue1033] driver: slightly generalize domain file
 finding scheme

---
 driver/util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/driver/util.py b/driver/util.py
index d3bb263c1f..7b46116f63 100644
--- a/driver/util.py
+++ b/driver/util.py
@@ -24,10 +24,11 @@ def find_domain_filename(task_filename):
     Find domain filename for the given task using automatic naming rules.
     """
     dirname, basename = os.path.split(task_filename)
+    basename_root, _ = os.path.splitext(basename)
 
     domain_basenames = [
         "domain.pddl",
-        basename[:3] + "-domain.pddl",
+        basename_root + "-domain.pddl",
         "domain_" + basename,
         "domain-" + basename,
     ]

From 112a5758fe66dd3a656f7d069202983028d35b9a Mon Sep 17 00:00:00 2001
From: Silvan Sievers <silvan.sievers@unibas.ch>
Date: Wed, 18 Aug 2021 16:46:49 +0200
Subject: [PATCH 2/3] [issue1033] do not require .pddl for domain files

---
 driver/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/util.py b/driver/util.py
index 7b46116f63..e31a735201 100644
--- a/driver/util.py
+++ b/driver/util.py
@@ -24,11 +24,11 @@ def find_domain_filename(task_filename):
     Find domain filename for the given task using automatic naming rules.
     """
     dirname, basename = os.path.split(task_filename)
-    basename_root, _ = os.path.splitext(basename)
+    basename_root, ext = os.path.splitext(basename)
 
     domain_basenames = [
         "domain.pddl",
-        basename_root + "-domain.pddl",
+        basename_root + "-domain" + ext,
         "domain_" + basename,
         "domain-" + basename,
     ]

From ef6417e7e41a1359ae7c23e092b5384dbc5a0887 Mon Sep 17 00:00:00 2001
From: Silvan Sievers <silvan.sievers@unibas.ch>
Date: Wed, 18 Aug 2021 16:50:14 +0200
Subject: [PATCH 3/3] [issue1033] add change log entry

---
 CHANGES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fabfe886f1..6089b5e75a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -116,6 +116,10 @@ after the corresponding tracker issues.
 - For developers: use RandomNumberGenerator class in VariableOrderFinder
   <http://issues.fast-downward.org/issue1032>
 
+- For users: the driver now finds domain files <taskfile>-domain.<ext>
+  for task files called <taskfile>.<ext>
+  <http://issues.fast-downward.org/issue1033>
+
 
 ## Fast Downward 20.06