Add tests for all generators and fix small compilation/PDDL issues.

Author: jendrikseipp

.github/workflows/ubuntu.yml

@@ -12,21 +12,44 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            python-version: "3.10"
+            python-version: "3.11"
           - os: ubuntu-24.04
-            python-version: "3.13"
+            python-version: "3.14"
 
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6
+
+    - name: Install Apptainer
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository -y ppa:apptainer/ppa
+        sudo apt-get update
+        sudo apt-get install -y apptainer
 
     - name: Install dependencies
       run: |
         # ocaml is needed for crewplanning
         sudo apt install ocaml ocamlbuild tox
         curl -LsSf https://astral.sh/uv/install.sh | sh
+        apptainer pull scorpion.sif oras://ghcr.io/jendrikseipp/scorpion:latest
+        sudo cp scorpion.sif /usr/local/bin/
+
+    - name: Install VAL
+      run: |
+        sudo apt-get -y install g++ make flex bison
+        git clone https://github.com/KCL-Planning/VAL.git
+        pushd VAL
+        git checkout a5565396007eee73ac36527fbf904142b3077c74
+        make clean  # Remove old build artifacts and binaries.
+        sed -i 's/-Werror //g' Makefile  # Ignore warnings.
+        make -j
+        cp validate /usr/local/bin/
+        popd
+        rm -r VAL
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 

.gitignore

@@ -1,12 +1,12 @@
-doc.tex
 *.aux
 *.log
 *.out
 *.pdf
 *.toc
 *.o
-Makefile.depend
 .tox/
+doc.tex
+output.sas
 assembly/assembly
 blocksworld/3ops/2pddl/2pddl
 blocksworld/4ops/2pddl/2pddl
@@ -32,20 +32,11 @@ miconic/miconic
 miconic-fulladl/miconic
 miconic-simpleadl/miconic
 minigrid/log.txt
-minigrid/grid_4room2_fpl_s3_seed0_n0.pddl
 movie/movie
 mprime/mprime
 mystery/mystery
 nomystery/build/
 nomystery/nomystery
-nomystery/old/Makefile.depend
-nomystery/old/nomystery
-nomystery/release-search
-nomystery/CMakeFiles
-nomystery/CMakeCache.txt
-nomystery/cmake_install.cmake
-nomystery/Makefile
-nomystery/nomystery_opt
 npuzzle/n-puzzle-generator
 openstacks/generate_pddl
 openstacks/generate_problems

agricola/Makefile

@@ -1,2 +1,2 @@
 test:
-	./GenAgricola.py 4 3
+	./GenAgricola.py 1 2 > $${PDDL_TEST_DIR}/p01.pddl

assembly/Makefile

@@ -27,7 +27,7 @@ distclean: clean
 	rm -f assembly
 
 test: build
-	./assembly -d 5 -m 5 -h 90 -n 1 -r 5 -t 5 -a 25 -o 50
+	./assembly -d 5 -m 5 -h 90 -n 1 -r 5 -t 5 -a 25 -o 50 > $${PDDL_TEST_DIR}/problem.pddl
 
 lint:
 	lclint -booltype Bool $(SOURCES)

assembly/domain.pddl

@@ -1,7 +1,7 @@
 (define (domain assembly)
    (:requirements :adl)
-   (:types assembly resource)   ; Individual parts are atomic assemblies
-   (:predicates (available ?x - (either resource assembly))
+   (:types assembly resource - object)   ; Individual parts are atomic assemblies
+   (:predicates (available ?x - object)
 		(complete ?a - assembly)
 		(requires ?a - assembly ?r - resource)
 		(committed ?r - resource ?a - assembly)
@@ -53,7 +53,7 @@
    ; end.
    (:action remove
       :parameters (?part ?whole - assembly)
-      :vars (?res - resource)
+   ;  :vars (?res - resource)
       :precondition (and (forall (?res - resource)
 			    (imply (requires ?whole ?res)
 				   (committed ?res ?whole)))
@@ -79,4 +79,5 @@
                                            (not (= ?tp ?part))
 					   (incorporated ?tp ?whole)))))
 			 (and (complete ?whole)
-			      (available ?whole))))))
+			      (available ?whole)))))
+)

barman/Makefile

@@ -1,2 +1,2 @@
 test:
-	./barman-generator.py 1 2 3
+	./barman-generator.py 1 2 3 > $${PDDL_TEST_DIR}/p01.pddl

blocksworld/3ops/2pddl/2pddl.c

@@ -5,12 +5,12 @@
  * (C) Copyright 2001 Albert Ludwigs University Freiburg
  *     Institute of Computer Science
  *
- * All rights reserved. Use of this software is permitted for 
- * non-commercial research purposes, and it may be copied only 
+ * All rights reserved. Use of this software is permitted for
+ * non-commercial research purposes, and it may be copied only
  * for that use.  All copies must include this copyright message.
  * This software is made available AS IS, and neither the authors
  * nor the  Albert Ludwigs University Freiburg make any warranty
- * about the software or its performance. 
+ * about the software or its performance.
  *********************************************************************/
 
 
@@ -34,7 +34,7 @@ typedef unsigned char Bool;
 /* commands
  */
 char *gdata;
-int gn; 
+int gn;
 
 
 
@@ -73,12 +73,18 @@ int main( int argc, char *argv[] )
   }
   while ( (c = fgetc( data )) != '\n' );
   for ( i = 0; i < gn; i++ ) {
-    fscanf( data, " %d", &(initial[i + 1]) );
+    if (fscanf( data, " %d", &(initial[i + 1]) ) != 1) {
+      printf("Error reading initial state\n");
+      exit(1);
+    }
   }
   while ( (c = fgetc( data )) != '\n' );
   while ( (c = fgetc( data )) != '\n' );
   for ( i = 0; i < gn; i++ ) {
-    fscanf( data, " %d", &(goal[i + 1]) );
+    if (fscanf( data, " %d", &(goal[i + 1]) ) != 1) {
+      printf("Error reading goal state\n");
+      exit(1);
+    }
   }
 
   if ( 0 ) {
@@ -119,8 +125,8 @@ int main( int argc, char *argv[] )
     }
   }
   printf(")\n)\n)\n\n\n");
-  
-  
+
+
 
   exit( 0 );
 

blocksworld/3ops/2pddl/Makefile

@@ -4,12 +4,12 @@
 
 ####### FLAGS
 
-TYPE	= 
-ADDONS	= 
+TYPE	=
+ADDONS	=
 
 CC      = gcc
 
-CFLAGS	= -O6 -Wall -g -ansi $(TYPE) $(ADDONS) 
+CFLAGS	= -O6 -Wall -g -ansi $(TYPE) $(ADDONS)
 # -g -pg
 
 LIBS    = -lm
@@ -30,9 +30,12 @@ OBJECTS 	= $(SOURCES:.c=.o)
 ####### Build rules
 
 
-miconic: $(OBJECTS)
+2pddl: $(OBJECTS)
 	$(CC) -o 2pddl $(OBJECTS) $(CFLAGS) $(LIBS)
 
+test: 2pddl
+	../../bwstates.1/bwstates -s 2 -n 5 -r 1 > $${PDDL_TEST_DIR}/problem.pddl
+
 # misc
 clean:
 	rm -f *.o *.bak *~ *% core *_pure_p9_c0_400.o.warnings \

blocksworld/4ops/2pddl/2pddl.c

@@ -5,12 +5,12 @@
  * (C) Copyright 2001 Albert Ludwigs University Freiburg
  *     Institute of Computer Science
  *
- * All rights reserved. Use of this software is permitted for 
- * non-commercial research purposes, and it may be copied only 
+ * All rights reserved. Use of this software is permitted for
+ * non-commercial research purposes, and it may be copied only
  * for that use.  All copies must include this copyright message.
  * This software is made available AS IS, and neither the authors
  * nor the  Albert Ludwigs University Freiburg make any warranty
- * about the software or its performance. 
+ * about the software or its performance.
  *********************************************************************/
 
 
@@ -34,7 +34,7 @@ typedef unsigned char Bool;
 /* commands
  */
 char *gdata;
-int gn; 
+int gn;
 
 
 
@@ -73,12 +73,18 @@ int main( int argc, char *argv[] )
   }
   while ( (c = fgetc( data )) != '\n' );
   for ( i = 0; i < gn; i++ ) {
-    fscanf( data, " %d", &(initial[i + 1]) );
+    if (fscanf( data, " %d", &(initial[i + 1]) ) != 1) {
+      printf("Error reading initial state\n");
+      exit(1);
+    }
   }
   while ( (c = fgetc( data )) != '\n' );
   while ( (c = fgetc( data )) != '\n' );
   for ( i = 0; i < gn; i++ ) {
-    fscanf( data, " %d", &(goal[i + 1]) );
+    if (fscanf( data, " %d", &(goal[i + 1]) ) != 1) {
+      printf("Error reading goal state\n");
+      exit(1);
+    }
   }
 
   if ( 0 ) {
@@ -120,8 +126,8 @@ int main( int argc, char *argv[] )
     }
   }
   printf(")\n)\n)\n\n\n");
-  
-  
+
+
 
   exit( 0 );
 

blocksworld/4ops/2pddl/Makefile

@@ -4,12 +4,12 @@
 
 ####### FLAGS
 
-TYPE	= 
-ADDONS	= 
+TYPE	=
+ADDONS	=
 
 CC      = gcc
 
-CFLAGS	= -O6 -Wall -g -ansi $(TYPE) $(ADDONS) 
+CFLAGS	= -O6 -Wall -g -ansi $(TYPE) $(ADDONS)
 # -g -pg
 
 LIBS    = -lm
@@ -30,9 +30,12 @@ OBJECTS 	= $(SOURCES:.c=.o)
 ####### Build rules
 
 
-miconic: $(OBJECTS)
+2pddl: $(OBJECTS)
 	$(CC) -o 2pddl $(OBJECTS) $(CFLAGS) $(LIBS)
 
+test: 2pddl
+	../../bwstates.1/bwstates -s 2 -n 5 -r 1 > $${PDDL_TEST_DIR}/problem.pddl
+
 # misc
 clean:
 	rm -f *.o *.bak *~ *% core *_pure_p9_c0_400.o.warnings \