finalize edits

Author: noahvanes

code/jvm/src/main/scala/maf/cli/experiments/precision/AnalysisComparisonAlt.scala

@@ -23,10 +23,10 @@ abstract class AnalysisComparisonAlt[Num: IntLattice, Rea: RealLattice, Bln: Boo
     // - the number of runs for the concrete interpreter
     def analyses: List[(SchemeExp => Analysis, String)]
     def benchmarks: List[Benchmark]
-    def runs = 1 // number of runs for the concrete interpreter
+    def runs = 3 // number of runs for the concrete interpreter
 
     // and can, optionally, be configured in its timeouts (default: 10min.) and the number of concrete runs
-    def timeout() = Timeout.start(Duration(5, MINUTES)) // timeout for the analyses
+    def timeout() = Timeout.start(Duration(10, MINUTES)) // timeout for the analyses
 
     // keep the results of the benchmarks in a table
     enum Result:
@@ -152,18 +152,6 @@ abstract class SASBenchmarks
         //"triangl" <- times out in concrete interpreter
       ).map(name => s"test/R5RS/gabriel/$name.scm")
 
-    def slowBenchmarks = 
-      List(
-        "boyer",
-        "browse",
-        "destruc"
-      ).map(name => s"test/R5RS/gabriel/$name.scm")
-      ++
-      List(
-          "test/R5RS/gambit/matrix.scm",
-          "test/R5RS/various/mceval.scm",
-      )
-
     def extraBenchmarks = 
       List(
           "test/R5RS/various/grid.scm",
@@ -224,28 +212,17 @@ object CountIterationBenchmark extends SASBenchmarks:
     dssFS0, dssFS0NoGC
   )
 
-  var results: Table[Option[Long]] = Table.empty 
+  var results: Table[Int] = Table.empty 
 
   override protected def forBenchmark(path: Benchmark, program: SchemeExp): Unit =
     println(s"ANALYZING $path")
     analyses.foreach { case (analysis, name) => 
       val anl = analysis(program)
       anl.analyzeWithTimeout(Timeout.start(Duration(15, MINUTES)))
-      val res = anl.asInstanceOf[SchemeModFLocalFS].computeOneCountsPercentage.map(_ * 100)
-      results = results.add(path, name, res.map(_.round))
+      results = results.add(path, name, anl.asInstanceOf[SchemeModFLocalFS].iterations)
     }
 
   override def timeout() = Timeout.none
 
-  private def showResult(res: Option[Long]): String = 
-    res match
-      case None => "N/A"
-      case Some(value) => s"$value%"
-  
   override protected def showResults() =
-    println(results.prettyString(format=showResult))
-
-  override protected def writeResultsToFile(outputFolder: Option[String]) = 
-    outputFolder.foreach { dir => 
-      writeToFile(results, s"$dir/iteration-benchmarks.csv") 
-    }
+    println(results.prettyString())