Soar 9.4 performance is no longer relevant

SoarGroup · Oct 17, 2023 · 8707942 · 8707942
1 parent c12e69a
commit 8707942
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 9,414 deletions.
diff --git a/...ormanceTests/TestAgents/arithmetic96.soar → PerformanceTests/TestAgents/arithmetic.soar b/...ormanceTests/TestAgents/arithmetic96.soar → PerformanceTests/TestAgents/arithmetic.soar
diff --git a/PerformanceTests/TestAgents/arithmetic94.soar b/PerformanceTests/TestAgents/arithmetic94.soar
diff --git a/PerformanceTests/TestAgents/arithmetic94_learning.soar b/PerformanceTests/TestAgents/arithmetic94_learning.soar
diff --git a/...sts/TestAgents/arithmetic96_learning.soar → ...Tests/TestAgents/arithmetic_learning.soar b/...sts/TestAgents/arithmetic96_learning.soar → ...Tests/TestAgents/arithmetic_learning.soar
diff --git a/PerformanceTests/TestAgents/fifteen96.soar → PerformanceTests/TestAgents/fifteen.soar b/PerformanceTests/TestAgents/fifteen96.soar → PerformanceTests/TestAgents/fifteen.soar
diff --git a/PerformanceTests/TestAgents/fifteen94.soar b/PerformanceTests/TestAgents/fifteen94.soar
diff --git a/PerformanceTests/TestAgents/fifteen94_learning.soar b/PerformanceTests/TestAgents/fifteen94_learning.soar
diff --git a/...eTests/TestAgents/fifteen96_learning.soar → ...nceTests/TestAgents/fifteen_learning.soar b/...eTests/TestAgents/fifteen96_learning.soar → ...nceTests/TestAgents/fifteen_learning.soar
diff --git a/...manceTests/TestAgents/mac-planning96.soar → ...ormanceTests/TestAgents/mac-planning.soar b/...manceTests/TestAgents/mac-planning96.soar → ...ormanceTests/TestAgents/mac-planning.soar
diff --git a/PerformanceTests/TestAgents/mac-planning94.soar b/PerformanceTests/TestAgents/mac-planning94.soar
diff --git a/PerformanceTests/TestAgents/mac-planning94_learning.soar b/PerformanceTests/TestAgents/mac-planning94_learning.soar
diff --git a/...s/TestAgents/mac-planning96_learning.soar → ...sts/TestAgents/mac-planning_learning.soar b/...s/TestAgents/mac-planning96_learning.soar → ...sts/TestAgents/mac-planning_learning.soar
diff --git a/...sts/TestAgents/water-jug-lookahead96.soar → ...Tests/TestAgents/water-jug-lookahead.soar b/...sts/TestAgents/water-jug-lookahead96.soar → ...Tests/TestAgents/water-jug-lookahead.soar
diff --git a/PerformanceTests/TestAgents/water-jug-lookahead94.soar b/PerformanceTests/TestAgents/water-jug-lookahead94.soar
diff --git a/PerformanceTests/TestAgents/water-jug-lookahead94_learning.soar b/PerformanceTests/TestAgents/water-jug-lookahead94_learning.soar
diff --git a/...gents/water-jug-lookahead96_learning.soar → ...tAgents/water-jug-lookahead_learning.soar b/...gents/water-jug-lookahead96_learning.soar → ...tAgents/water-jug-lookahead_learning.soar
diff --git a/PerformanceTests/do_performance_test.sh b/PerformanceTests/do_performance_test.sh
@@ -1,100 +1,81 @@
 #!/usr/bin/env bash
 
+set -o errexit
+set -o nounset
+set -o pipefail
+if [[ "${TRACE-0}" == "1" ]]; then
+    set -o xtrace
+fi
+
+usage="Usage: $0 [-s [full | fast]] "
+
+if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
+    echo "$usage
+
+Score Soar's performance on a variety of tasks.
+
+"
+    exit
+fi
+
 lVersion="9.6"
 lTestSuite="full"
 lUnitTests=off
 
-while getopts uv:s: opt
+while getopts u:s: opt
 do
     case "$opt" in
       u)  lUnitTests=on;;
-      v)  lVersion="$OPTARG";;
       s)  lTestSuite="$OPTARG";;
       \?)		# unknown flag
-      	  echo >&2 \
-	  "usage: $0 [-v [9.4 | 9.6]] [-s [full | fast]] "
+      	  echo >&2 "$usage"
 	  exit 1;;
     esac
 done
-shift `expr $OPTIND - 1`
+shift "$((OPTIND - 1))"
 
 echo "================================================================================="
 echo "Running $lTestSuite performance tests using Soar $lVersion agents..."
 echo "================================================================================="
 
-if [ $lTestSuite == "full" ] ; then
-  if [ $lVersion == "9.6" ] ; then
+if [ "$lTestSuite" == "full" ] ; then
     nice -n -10 ./PerformanceTests wait 3 1000000
     nice -n -10 ./PerformanceTests wait_learning 1 1000000 2
-    nice -n -10 ./PerformanceTests arithmetic96 9
-    nice -n -10 ./PerformanceTests arithmetic96_learning 1 0 9
+    nice -n -10 ./PerformanceTests arithmetic 9
+    nice -n -10 ./PerformanceTests arithmetic_learning 1 0 9
     nice -n -10 ./PerformanceTests Teach_Soar_90_Games 2 10000
     nice -n -10 ./PerformanceTests FactorizationStressTest 2
     nice -n -10 ./PerformanceTests FactorizationStressTest_learning 2
-    nice -n -10 ./PerformanceTests fifteen96 3 5000
-    nice -n -10 ./PerformanceTests fifteen96_learning 10 500
-    nice -n -10 ./PerformanceTests count-test-5000 3
-    nice -n -10 ./PerformanceTests count-test-5000_learning 3
-    nice -n -10 ./PerformanceTests mac-planning96 1 300 15
-    nice -n -10 ./PerformanceTests mac-planning96_learning 4 165 64
-    nice -n -10 ./PerformanceTests water-jug-lookahead96 15 10000
-    nice -n -10 ./PerformanceTests water-jug-lookahead96_learning 2 102 100
-  elif [ $lVersion == "9.4" ] ; then
-    nice -n -10 ./PerformanceTests wait 3 1000000
-    nice -n -10 ./PerformanceTests wait_learning 1 1000000 2
-    nice -n -10 ./PerformanceTests arithmetic94 9
-    nice -n -10 ./PerformanceTests arithmetic94_learning 1 0 9
-    nice -n -10 ./PerformanceTests FactorizationStressTest 2
-    nice -n -10 ./PerformanceTests FactorizationStressTest_learning 2
-    nice -n -10 ./PerformanceTests fifteen94 3 5000
-    nice -n -10 ./PerformanceTests fifteen94_learning 10 500
+    nice -n -10 ./PerformanceTests fifteen 3 5000
+    nice -n -10 ./PerformanceTests fifteen_learning 10 500
     nice -n -10 ./PerformanceTests count-test-5000 3
     nice -n -10 ./PerformanceTests count-test-5000_learning 3
-    nice -n -10 ./PerformanceTests mac-planning94 1 300 15
-    nice -n -10 ./PerformanceTests mac-planning94_learning 4 165 64
-    nice -n -10 ./PerformanceTests water-jug-lookahead94 15 10000
-    nice -n -10 ./PerformanceTests water-jug-lookahead94_learning 2 102 100
-  fi
-elif [ $lTestSuite == "fast" ] ; then
-  if [ $lVersion == "9.6" ] ; then
+    nice -n -10 ./PerformanceTests mac-planning 1 300 15
+    nice -n -10 ./PerformanceTests mac-planning_learning 4 165 64
+    nice -n -10 ./PerformanceTests water-jug-lookahead 15 10000
+    nice -n -10 ./PerformanceTests water-jug-lookahead_learning 2 102 100
+elif [ "$lTestSuite" == "fast" ] ; then
     nice -n -10 ./PerformanceTests wait 1 1000000
     nice -n -10 ./PerformanceTests wait_learning 1 1000000
-    nice -n -10 ./PerformanceTests arithmetic96 2
-    nice -n -10 ./PerformanceTests arithmetic96_learning 1 0 3
+    nice -n -10 ./PerformanceTests arithmetic 2
+    nice -n -10 ./PerformanceTests arithmetic_learning 1 0 3
     nice -n -10 ./PerformanceTests Teach_Soar_90_Games 1 10000
     nice -n -10 ./PerformanceTests FactorizationStressTest 1
     nice -n -10 ./PerformanceTests FactorizationStressTest_learning 1
-    nice -n -10 ./PerformanceTests fifteen96 2 5000
-    nice -n -10 ./PerformanceTests fifteen96_learning 2 500
-    nice -n -10 ./PerformanceTests count-test-5000 1
-    nice -n -10 ./PerformanceTests count-test-5000_learning 1
-    nice -n -10 ./PerformanceTests mac-planning96 1 300 3
-    nice -n -10 ./PerformanceTests mac-planning96_learning 2 165 32
-    nice -n -10 ./PerformanceTests water-jug-lookahead96 3 10000
-    nice -n -10 ./PerformanceTests water-jug-lookahead96_learning 2 102 100
-
-  elif [ $lVersion == "9.4" ] ; then
-    nice -n -10 ./PerformanceTests wait 1 1000000
-    nice -n -10 ./PerformanceTests wait_learning 1 1000000
-    nice -n -10 ./PerformanceTests arithmetic94 2
-    nice -n -10 ./PerformanceTests arithmetic94_learning 1 0 3
-    nice -n -10 ./PerformanceTests FactorizationStressTest 1
-    nice -n -10 ./PerformanceTests FactorizationStressTest_learning 1
-    nice -n -10 ./PerformanceTests fifteen94 2 5000
-    nice -n -10 ./PerformanceTests fifteen94_learning 2 500
+    nice -n -10 ./PerformanceTests fifteen 2 5000
+    nice -n -10 ./PerformanceTests fifteen_learning 2 500
     nice -n -10 ./PerformanceTests count-test-5000 1
     nice -n -10 ./PerformanceTests count-test-5000_learning 1
-    nice -n -10 ./PerformanceTests mac-planning94 1 300 3
-    nice -n -10 ./PerformanceTests mac-planning94_learning 2 165 32
-    nice -n -10 ./PerformanceTests water-jug-lookahead94 3 10000
-    nice -n -10 ./PerformanceTests water-jug-lookahead94_learning 2 102 100
-  fi
+    nice -n -10 ./PerformanceTests mac-planning 1 300 3
+    nice -n -10 ./PerformanceTests mac-planning_learning 2 165 32
+    nice -n -10 ./PerformanceTests water-jug-lookahead 3 10000
+    nice -n -10 ./PerformanceTests water-jug-lookahead_learning 2 102 100
 fi
 
 if [ $lUnitTests != off ] ; then
   echo "Chunking Unit Tests"
   time nice -n -10 ./UnitTests -c ChunkingTests  > /dev/null
-  echo "\nFunctional Tests"
+  printf "\nFunctional Tests\n"
   time nice -n -10 ./UnitTests -c FunctionalTests  > /dev/null
 fi