QuMuLab · connoralittle · Sep 3, 2024 · Sep 4, 2024 · Sep 9, 2024 · Sep 25, 2024
diff --git a/core/downward b/core/downward
diff --git a/fond-domains b/fond-domains
diff --git a/fond-utils b/fond-utils
diff --git a/pr2 b/pr2
@@ -3,9 +3,10 @@
 set -e
 
 # Settings
-BASEDIR="$(dirname "$0")/core/downward"
-DEBUG_BUILD="debug64"
-RELEASE_BUILD="release64"
+BASEDIR_SAMPLE="$(dirname "$0")"
+BASEDIR="${BASEDIR_SAMPLE}/core/downward"
+DEBUG_BUILD="debug"
+RELEASE_BUILD="release"
 
 MAXWIDTH=5
 INV_TIME_LIMIT="300"
@@ -101,7 +102,7 @@ function run {
         shift
     else
         # checks if there are any symmetries to play with
-        timeout "$OBJ_SAMPLE_CHECK_LIMIT" bash -c "python $BASEDIR/pr2-scripts/sample_objects.py --domain $1 --problem $2 --output object-sampled-problem.pddl --sample -1 > object-sampled-output.txt" || true
+        timeout "$OBJ_SAMPLE_CHECK_LIMIT" bash -c "python $BASEDIR_SAMPLE/pr2-scripts/sample_objects.py --domain $1 --problem $2 --output object-sampled-problem.pddl --sample -1 > object-sampled-output.txt" || true
 
         if grep -q "True" object-sampled-output.txt; then
 
@@ -112,9 +113,9 @@ function run {
             # Iterate over the object sampling indices
             for i in ${!OBJ_SAMPLE_RATES[@]}; do
                 echo "Testing with ${OBJ_SAMPLE_RATES[$i]} symmetric objects for a max of ${OBJ_SAMPLE_TIMES[$i]} seconds..."
-                python $BASEDIR/pr2-scripts/sample_objects.py --domain "$1" --problem "$2" --output object-sampled-problem.pddl --sample "${OBJ_SAMPLE_RATES[$i]}"
+                python $BASEDIR_SAMPLE/pr2-scripts/sample_objects.py --domain "$1" --problem "$2" --output object-sampled-problem.pddl --sample "${OBJ_SAMPLE_RATES[$i]}"
 
-                timeout "${OBJ_SAMPLE_TIMES[$i]}" bash -c "$BASEDIR/pr2 --disable-object-sampling $1 object-sampled-problem.pddl --final-fsap-free-round 0 ${@:3} > object-sampled-subsolve.txt 2>&1" || true
+                timeout "${OBJ_SAMPLE_TIMES[$i]}" bash -c "$BASEDIR_SAMPLE/pr2 --disable-object-sampling $1 object-sampled-problem.pddl --final-fsap-free-round 0 ${@:3} > object-sampled-subsolve.txt 2>&1" || true
 
                 if grep -Fxq "Strong cyclic solution found." object-sampled-subsolve.txt
                 then
@@ -135,8 +136,12 @@ function run {
         rm -f object-sampled-*
     fi
 
-    $FD --translate $1 $2 --translate-options --keep-unimportant-variables --invariant-generation-max-time $INV_TIME_LIMIT
+
+    echo determinizing domain
+    fond-utils determinize --input $1 --output determinized-domain.pddl --suffix-domain ""
+    $FD --translate determinized-domain.pddl $2 --translate-options --keep-unimportant-variables --invariant-generation-max-time $INV_TIME_LIMIT
     shift 2
+    rm determinized-domain.pddl
 
     set -e
     $FD$OPT output.sas --search "pr2search()" "$@" || true
@@ -214,4 +219,4 @@ else
     run "$@"
 fi
 
-exit 0
+exit 0
+31 −12		src/search/evaluator.cc
+9 −0		src/search/heuristics/relaxation_heuristic.cc
+1 −0		src/search/heuristics/relaxation_heuristic.h
+29 −17		src/search/search_algorithm.cc
+4 −1		src/search/search_algorithm.h
+4 −2		src/search/search_algorithms/lazy_search.cc
+24 −9		src/search/search_statistics.cc
+1 −1		src/search/task_proxy.h
+7 −5		src/search/task_utils/task_properties.cc
+10 −0		src/search/task_utils/task_properties.h
+3 −1		.gitignore
+1 −1		CODE_OF_CONDUCT.md
+96 −7		README.md
+87 −0		fondutils/__main__.py
+8 −17		fondutils/determizer.py
+109 −0		fondutils/normalizer.py
+12 −0		fondutils/pddl/__init__.py
+12 −0		fondutils/pddl/domprob.lark
+82 −0		fondutils/pddl/domprob.py
+0 −84		normalizer.py
+1 −0		requirements.txt
+36 −0		tests/domain_01.pddl
+36 −0		tests/domain_02.pddl
+28 −0		tests/domain_03.pddl
+36 −0		tests/domain_04.pddl
+60 −0		tests/domain_05.pddl
+40 −0		tests/domprob_03.pddl
+79 −0		tests/domprob_05.pddl
+19 −0		tests/problem_03.pddl