Commit 1691d6f3 authored by Arthur Bit-Monnot's avatar Arthur Bit-Monnot

Fix analysis of rcll benchmark

parent bb597a06
......@@ -15,15 +15,15 @@ object RCLL extends App {
dahu.utils.debug.LOG_LEVEL = 2
// warmup
solve(new File("out/rcll.dom.pddl"), new File(s"out/rcll.001-R1-C0.pb.pddl"), false, a => 3)
solve(new File("out/rcll.dom.pddl"), new File(s"out/rcll.001-R1-C0.pb.pddl"), false, a => 3)
solve(new File("out/rcll.dom.pddl"), new File(s"out/rcll.001-R1-C0.pb.pddl"), false, a => 3)
solve(new File("pddl/rcll.dom.pddl"), new File(s"pddl/rcll.001-R1-C0.pb.pddl"), false, a => 3)
solve(new File("pddl/rcll.dom.pddl"), new File(s"pddl/rcll.001-R1-C0.pb.pddl"), false, a => 3)
solve(new File("pddl/rcll.dom.pddl"), new File(s"pddl/rcll.001-R1-C0.pb.pddl"), false, a => 3)
for(game <- 1 to 20; c <- 0 to 1; r <- 1 to 3; spec <- Seq(false, true)) {
val pbName = f"$game%03d-R$r-C$c"
val domain = new File("out/rcll.dom.pddl")
val problem = new File(s"out/rcll.$pbName.pb.pddl")
val domain = new File("pddl/rcll.dom.pddl")
val problem = new File(s"pddl/rcll.$pbName.pb.pddl")
val colorLevel =
if(Set(6, 9, 12, 17).contains(game))
......
......@@ -51,7 +51,7 @@ object RCLLAnalysis extends App {
}
val formatLine: String => String = {
case "spec" => raw"\lcpspec"
case "spe" => raw"\lcpspec"
case "gen" => raw"\lcpgen"
case "M1-o0" => raw"\omtsat"
case "M1-o1" => raw"\omtopt"
......@@ -66,12 +66,12 @@ object RCLLAnalysis extends App {
case "M2-o0" => 3
case "M2-o1" => 4
case "gen" => 6
case "spec" => 7
case "spe" => 7
case "M-o" => 10
}
val leoRegex = raw"(\d{3})-(C\d)-(R\d)[\t ]+([^\t ]*)[\t ]+(.{2})[\t ]+(.*)".r
val lcpRegex = raw"(\d{3})-(R\d)-(C\d)[\t ]+([^\t ]*)[\t ]+(.{2})[\t ]+(\d+,\d+)".r
val lcpRegex = raw"(\d{3})-(R\d)-(C\d)[\t ]+([^\t ]*)[\t ]+(.{2})[\t ]+(\d+\.\d+)".r
val timeRegex = raw"([0-9]*[\.])?([0-9]+)s?".r
def time(s: String): FiniteDuration = s match {
......@@ -84,7 +84,7 @@ object RCLLAnalysis extends App {
case leoRegex(g, c, r, planner, "__", _) =>
Run(Seq(g, r, c), planner, None)
case lcpRegex(g, r, c, planner, "OK", dur) =>
Run(Seq(g, r, c), planner, Some(dur.replace(',', '.').toFloat.seconds))
Run(Seq(g, r, c), planner, Some(dur.toFloat.seconds))
case lcpRegex(g, r, c, planner, "__", dur) =>
Run(Seq(g, r, c), planner, None)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment