Merge branch 'beam' into 'master'

Limit memory in A* search

See merge request !33

tools/benchmarks/configs/seq-sat-ipc08-msfa3-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc08-msfa3.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc08-msfa5-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc08-msfa5.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc08-rrapn-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc08-rrapn.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-msfa3-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-msfa3.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-msfa5-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-msfa5.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-rrapn-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc11-rrapn.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-msfa3-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-msfa3.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-msfa5-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-msfa5.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-rrapn-2.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/seq-sat-ipc14-rrapn.json

@@ -49,5 +49,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-msfa5sched-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-msfa5sched.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-rrapnsched-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-rrapnsched.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-trrapn-2.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/configs/tempo-sat-ipc08-trrapn.json

@@ -69,5 +69,5 @@
     }
   },
   "threadCount": 5,
-  "timeout": 900
+  "timeout": 1800
 }

tools/benchmarks/mcrun.sh

@@ -22,9 +22,13 @@ tfd_flag="$3"
 
 cd $HOME/git/$TEvariant/tools/benchmarks
 if [ -z "$tfd_flag" ]; then
-qsub -m e -l select=1:ncpus=6:mem=22gb:scratch_local=10gb -l walltime=1:00:00 -- "$HOME/git/$TEvariant/tools/benchmarks/mcbenchmark.sh" "configs/$config.json" &
+    qsub -m e -l select=1:ncpus=6:mem=22gb:scratch_local=10gb -l walltime=1:55:00 -- "$HOME/git/$TEvariant/tools/benchmarks/mcbenchmark.sh" "configs/$config.json" &
 else
-qsub -m e -l select=1:ncpus=1:mem=50gb:scratch_local=10gb -l walltime=2:15:00 -- "$HOME/git/$TEvariant/tools/benchmarks/mcbenchmark.sh" "configs/$config.json" &
+    if echo "$config" | grep -q 'tfd2014-3' >/dev/null; then
+        qsub -m e -l select=1:ncpus=1:mem=60gb:scratch_local=10gb -l walltime=2:15:00 -- "$HOME/git/$TEvariant/tools/benchmarks/mcbenchmark.sh" "configs/$config.json" &
+    else
+        qsub -m e -l select=1:ncpus=1:mem=30gb:scratch_local=10gb -l walltime=2:15:00 -- "$HOME/git/$TEvariant/tools/benchmarks/mcbenchmark.sh" "configs/$config.json" &
+    fi
 fi
 echo "`date -u '+[%H:%M:%S]'` Finished: $config"
 }

transport-docs/bp/data/seq-sat-6-ipc-scores.tex

@@ -4,36 +4,36 @@
 \midrule
 \multicolumn{1}{l|}{p01} & {\footnotesize 54} \textbf{1.00} & {\footnotesize 54} \textbf{1.00} & {\footnotesize 54} \textbf{1.00} & {\footnotesize 54} \textbf{1.00} & {\footnotesize 54} \textbf{1.00} & {\footnotesize 54} \textbf{1.00} & \multicolumn{1}{|r}{54}\\
 \multicolumn{1}{l|}{p02} & {\footnotesize 270} \textbf{1.00} & {\footnotesize 270} \textbf{1.00} & {\footnotesize 288} \textbf{0.94} & {\footnotesize 304} \textbf{0.89} & {\footnotesize 270} \textbf{1.00} & {\footnotesize 414} \textbf{0.65} & \multicolumn{1}{|r}{270}\\
-\multicolumn{1}{l|}{p03} & {\footnotesize 409} \textbf{0.87} & {\footnotesize 355} \textbf{1.00} & {\footnotesize 419} \textbf{0.85} & {\footnotesize 635} \textbf{0.56} & {\footnotesize 497} \textbf{0.71} & {\footnotesize 801} \textbf{0.44} & \multicolumn{1}{|r}{355}\\
+\multicolumn{1}{l|}{p03} & {\footnotesize 409} \textbf{0.90} & {\footnotesize 407} \textbf{0.91} & {\footnotesize 419} \textbf{0.88} & {\footnotesize 635} \textbf{0.58} & {\footnotesize 497} \textbf{0.74} & {\footnotesize 801} \textbf{0.46} & \multicolumn{1}{|r}{369}\\
 \multicolumn{1}{l|}{p04} & {\footnotesize 464} \textbf{0.78} & {\footnotesize 490} \textbf{0.74} & {\footnotesize 412} \textbf{0.88} & {\footnotesize 983} \textbf{0.37} & {\footnotesize 504} \textbf{0.72} & {\footnotesize 942} \textbf{0.39} & \multicolumn{1}{|r}{363}\\
 \multicolumn{1}{l|}{p05} & {\footnotesize 704} \textbf{0.83} & {\footnotesize 704} \textbf{0.83} & {\footnotesize 582} \textbf{1.00} & {\footnotesize 1187} \textbf{0.49} & {\footnotesize 737} \textbf{0.79} & {\footnotesize 1186} \textbf{0.49} & \multicolumn{1}{|r}{582}\\
-\multicolumn{1}{l|}{p06} & {\footnotesize 989} \textbf{0.76} & {\footnotesize 967} \textbf{0.78} & {\footnotesize 1026} \textbf{0.74} & {\footnotesize 1766} \textbf{0.43} & {\footnotesize 1117} \textbf{0.68} & {\footnotesize 1868} \textbf{0.40} & \multicolumn{1}{|r}{755}\\
-\multicolumn{1}{l|}{p07} & {\footnotesize 1011} \textbf{0.98} & {\footnotesize 1011} \textbf{0.98} & {\footnotesize 988} \textbf{1.00} & {\footnotesize 1868} \textbf{0.53} & {\footnotesize 1260} \textbf{0.78} & {\footnotesize 2081} \textbf{0.47} & \multicolumn{1}{|r}{988}\\
-\multicolumn{1}{l|}{p08} & {\footnotesize 1053} \textbf{0.88} & {\footnotesize 1053} \textbf{0.88} & {\footnotesize 925} \textbf{1.00} & {\footnotesize 2166} \textbf{0.43} & {\footnotesize 1216} \textbf{0.76} & {\footnotesize 2135} \textbf{0.43} & \multicolumn{1}{|r}{925}\\
-\multicolumn{1}{l|}{p09} & {\footnotesize 1027} \textbf{0.93} & {\footnotesize 1027} \textbf{0.93} & {\footnotesize 955} \textbf{1.00} & {\footnotesize 1880} \textbf{0.51} & {\footnotesize 1001} \textbf{0.95} & {\footnotesize 2143} \textbf{0.45} & \multicolumn{1}{|r}{955}\\
+\multicolumn{1}{l|}{p06} & {\footnotesize 989} \textbf{0.76} & {\footnotesize 967} \textbf{0.78} & {\footnotesize 1024} \textbf{0.74} & {\footnotesize 1766} \textbf{0.43} & {\footnotesize 1117} \textbf{0.68} & {\footnotesize 1868} \textbf{0.40} & \multicolumn{1}{|r}{755}\\
+\multicolumn{1}{l|}{p07} & {\footnotesize 1011} \textbf{0.95} & {\footnotesize 1011} \textbf{0.95} & {\footnotesize 965} \textbf{1.00} & {\footnotesize 1868} \textbf{0.52} & {\footnotesize 1260} \textbf{0.77} & {\footnotesize 2081} \textbf{0.46} & \multicolumn{1}{|r}{965}\\
+\multicolumn{1}{l|}{p08} & {\footnotesize 1053} \textbf{0.88} & {\footnotesize 1053} \textbf{0.88} & {\footnotesize 923} \textbf{1.00} & {\footnotesize 2166} \textbf{0.43} & {\footnotesize 1216} \textbf{0.76} & {\footnotesize 2135} \textbf{0.43} & \multicolumn{1}{|r}{923}\\
+\multicolumn{1}{l|}{p09} & {\footnotesize 1027} \textbf{0.91} & {\footnotesize 1027} \textbf{0.91} & {\footnotesize 932} \textbf{1.00} & {\footnotesize 1880} \textbf{0.50} & {\footnotesize 1001} \textbf{0.93} & {\footnotesize 2143} \textbf{0.43} & \multicolumn{1}{|r}{932}\\
 \multicolumn{1}{l|}{p10} & {\footnotesize 1360} \textbf{0.78} & {\footnotesize 1360} \textbf{0.78} & {\footnotesize 1059} \textbf{1.00} & {\footnotesize 2260} \textbf{0.47} & {\footnotesize 1285} \textbf{0.82} & {\footnotesize 2091} \textbf{0.51} & \multicolumn{1}{|r}{1059}\\
 \multicolumn{1}{l|}{p11} & {\footnotesize 473} \textbf{1.00} & {\footnotesize 473} \textbf{1.00} & {\footnotesize 473} \textbf{1.00} & {\footnotesize 473} \textbf{1.00} & {\footnotesize 473} \textbf{1.00} & {\footnotesize 475} \textbf{1.00} & \multicolumn{1}{|r}{473}\\
 \multicolumn{1}{l|}{p12} & {\footnotesize 823} \textbf{0.97} & {\footnotesize 823} \textbf{0.97} & {\footnotesize 872} \textbf{0.91} & {\footnotesize 800} \textbf{0.99} & {\footnotesize 795} \textbf{1.00} & {\footnotesize 1244} \textbf{0.64} & \multicolumn{1}{|r}{795}\\
 \multicolumn{1}{l|}{p13} & {\footnotesize 1096} \textbf{0.88} & {\footnotesize 1096} \textbf{0.88} & {\footnotesize 965} \textbf{1.00} & {\footnotesize 2751} \textbf{0.35} & {\footnotesize 1147} \textbf{0.84} & {\footnotesize 2827} \textbf{0.34} & \multicolumn{1}{|r}{965}\\
 \multicolumn{1}{l|}{p14} & {\footnotesize 1582} \textbf{1.00} & {\footnotesize 1582} \textbf{1.00} & {\footnotesize 1966} \textbf{0.80} & {\footnotesize 3507} \textbf{0.45} & {\footnotesize 2157} \textbf{0.73} & {\footnotesize 3328} \textbf{0.48} & \multicolumn{1}{|r}{1582}\\
 \multicolumn{1}{l|}{p15} & {\footnotesize 2367} \textbf{0.96} & {\footnotesize 2280} \textbf{1.00} & {\footnotesize 3129} \textbf{0.73} & {\footnotesize 5221} \textbf{0.44} & {\footnotesize 2954} \textbf{0.77} & {\footnotesize 5659} \textbf{0.40} & \multicolumn{1}{|r}{2280}\\
 \multicolumn{1}{l|}{p16} & {\footnotesize 2321} \textbf{1.00} & {\footnotesize 2321} \textbf{1.00} & {\footnotesize 2765} \textbf{0.84} & {\footnotesize 6199} \textbf{0.37} & {\footnotesize 4928} \textbf{0.47} & {\footnotesize 6144} \textbf{0.38} & \multicolumn{1}{|r}{2321}\\
-\multicolumn{1}{l|}{p17} & {\footnotesize 3209} \textbf{1.00} & {\footnotesize 3209} \textbf{1.00} & {\footnotesize 4321} \textbf{0.74} & {\footnotesize 7239} \textbf{0.44} & {\footnotesize 4193} \textbf{0.77} & {\footnotesize 7494} \textbf{0.43} & \multicolumn{1}{|r}{3209}\\
+\multicolumn{1}{l|}{p17} & {\footnotesize 3209} \textbf{1.00} & {\footnotesize 3209} \textbf{1.00} & {\footnotesize 4315} \textbf{0.74} & {\footnotesize 7239} \textbf{0.44} & {\footnotesize 4193} \textbf{0.77} & {\footnotesize 7494} \textbf{0.43} & \multicolumn{1}{|r}{3209}\\
 \multicolumn{1}{l|}{p18} & {\footnotesize 3322} \textbf{0.88} & {\footnotesize 2936} \textbf{1.00} & {\footnotesize 3663} \textbf{0.80} & {\footnotesize 7542} \textbf{0.39} & {\footnotesize 4151} \textbf{0.71} & {\footnotesize 7737} \textbf{0.38} & \multicolumn{1}{|r}{2936}\\
 \multicolumn{1}{l|}{p19} & {\footnotesize 5051} \textbf{1.00} & {\footnotesize 5051} \textbf{1.00} & {\footnotesize 5073} \textbf{1.00} & {\footnotesize 9921} \textbf{0.51} & {\footnotesize 7648} \textbf{0.66} & {\footnotesize 8991} \textbf{0.56} & \multicolumn{1}{|r}{5051}\\
-\multicolumn{1}{l|}{p20} & {\footnotesize 3636} \textbf{1.00} & {\footnotesize 3873} \textbf{0.94} & {\footnotesize 4674} \textbf{0.78} & uns. & {\footnotesize 6773} \textbf{0.54} & {\footnotesize 8663} \textbf{0.42} & \multicolumn{1}{|r}{3636}\\
+\multicolumn{1}{l|}{p20} & {\footnotesize 3636} \textbf{1.00} & {\footnotesize 3873} \textbf{0.94} & {\footnotesize 4607} \textbf{0.79} & uns. & {\footnotesize 6773} \textbf{0.54} & {\footnotesize 8663} \textbf{0.42} & \multicolumn{1}{|r}{3636}\\
 \multicolumn{1}{l|}{p21} & {\footnotesize 431} \textbf{1.00} & {\footnotesize 431} \textbf{1.00} & {\footnotesize 431} \textbf{1.00} & {\footnotesize 431} \textbf{1.00} & {\footnotesize 431} \textbf{1.00} & {\footnotesize 431} \textbf{1.00} & \multicolumn{1}{|r}{431}\\
 \multicolumn{1}{l|}{p22} & {\footnotesize 675} \textbf{1.00} & {\footnotesize 675} \textbf{1.00} & {\footnotesize 677} \textbf{1.00} & {\footnotesize 679} \textbf{0.99} & {\footnotesize 675} \textbf{1.00} & {\footnotesize 1268} \textbf{0.53} & \multicolumn{1}{|r}{675}\\
 \multicolumn{1}{l|}{p23} & {\footnotesize 1140} \textbf{0.73} & {\footnotesize 1140} \textbf{0.73} & {\footnotesize 897} \textbf{0.93} & {\footnotesize 2414} \textbf{0.35} & {\footnotesize 837} \textbf{1.00} & {\footnotesize 2119} \textbf{0.39} & \multicolumn{1}{|r}{837}\\
 \multicolumn{1}{l|}{p24} & {\footnotesize 1227} \textbf{1.00} & {\footnotesize 1227} \textbf{1.00} & {\footnotesize 1352} \textbf{0.91} & {\footnotesize 2790} \textbf{0.44} & {\footnotesize 1301} \textbf{0.94} & {\footnotesize 2909} \textbf{0.42} & \multicolumn{1}{|r}{1227}\\
 \multicolumn{1}{l|}{p25} & {\footnotesize 1943} \textbf{0.92} & {\footnotesize 1943} \textbf{0.92} & {\footnotesize 1785} \textbf{1.00} & {\footnotesize 4007} \textbf{0.45} & {\footnotesize 1833} \textbf{0.97} & {\footnotesize 3764} \textbf{0.47} & \multicolumn{1}{|r}{1785}\\
-\multicolumn{1}{l|}{p26} & {\footnotesize 2421} \textbf{0.74} & {\footnotesize 2421} \textbf{0.74} & {\footnotesize 1797} \textbf{1.00} & {\footnotesize 4036} \textbf{0.45} & {\footnotesize 2502} \textbf{0.72} & {\footnotesize 3598} \textbf{0.50} & \multicolumn{1}{|r}{1797}\\
-\multicolumn{1}{l|}{p27} & {\footnotesize 3255} \textbf{0.77} & {\footnotesize 3255} \textbf{0.77} & {\footnotesize 2521} \textbf{1.00} & {\footnotesize 5791} \textbf{0.44} & {\footnotesize 3317} \textbf{0.76} & {\footnotesize 5948} \textbf{0.42} & \multicolumn{1}{|r}{2521}\\
-\multicolumn{1}{l|}{p28} & {\footnotesize 2465} \textbf{1.00} & {\footnotesize 2465} \textbf{1.00} & {\footnotesize 2594} \textbf{0.95} & {\footnotesize 6346} \textbf{0.39} & {\footnotesize 3027} \textbf{0.81} & {\footnotesize 7300} \textbf{0.34} & \multicolumn{1}{|r}{2465}\\
-\multicolumn{1}{l|}{p29} & {\footnotesize 2817} \textbf{1.00} & {\footnotesize 2890} \textbf{0.97} & {\footnotesize 2871} \textbf{0.98} & {\footnotesize 7168} \textbf{0.39} & {\footnotesize 3294} \textbf{0.86} & {\footnotesize 7237} \textbf{0.39} & \multicolumn{1}{|r}{2817}\\
+\multicolumn{1}{l|}{p26} & {\footnotesize 2421} \textbf{0.72} & {\footnotesize 2421} \textbf{0.72} & {\footnotesize 1753} \textbf{1.00} & {\footnotesize 4036} \textbf{0.43} & {\footnotesize 2502} \textbf{0.70} & {\footnotesize 3598} \textbf{0.49} & \multicolumn{1}{|r}{1753}\\
+\multicolumn{1}{l|}{p27} & {\footnotesize 3255} \textbf{0.75} & {\footnotesize 3255} \textbf{0.75} & {\footnotesize 2440} \textbf{1.00} & {\footnotesize 5791} \textbf{0.42} & {\footnotesize 3317} \textbf{0.74} & {\footnotesize 5948} \textbf{0.41} & \multicolumn{1}{|r}{2440}\\
+\multicolumn{1}{l|}{p28} & {\footnotesize 2465} \textbf{1.00} & {\footnotesize 2465} \textbf{1.00} & {\footnotesize 2575} \textbf{0.96} & {\footnotesize 6346} \textbf{0.39} & {\footnotesize 3027} \textbf{0.81} & {\footnotesize 7300} \textbf{0.34} & \multicolumn{1}{|r}{2465}\\
+\multicolumn{1}{l|}{p29} & {\footnotesize 2817} \textbf{0.99} & {\footnotesize 2890} \textbf{0.97} & {\footnotesize 2795} \textbf{1.00} & {\footnotesize 7168} \textbf{0.39} & {\footnotesize 3294} \textbf{0.85} & {\footnotesize 7237} \textbf{0.39} & \multicolumn{1}{|r}{2795}\\
 \multicolumn{1}{l|}{p30} & {\footnotesize 4703} \textbf{0.76} & {\footnotesize 4703} \textbf{0.76} & {\footnotesize 3595} \textbf{1.00} & uns. & {\footnotesize 5513} \textbf{0.65} & {\footnotesize 7892} \textbf{0.46} & \multicolumn{1}{|r}{3595}\\
 \midrule
-\textbf{total} & \textbf{27.43} & \textbf{27.61} & \textbf{27.77} & \textbf{15.50} & \textbf{24.43} & \textbf{15.19} & \\
+\textbf{total} & \textbf{27.37} & \textbf{27.42} & \textbf{27.85} & \textbf{15.47} & \textbf{24.36} & \textbf{15.15} & \\
 \bottomrule
 \end{tabular}