Round down percentage coverage

PySymGym · Oct 12, 2024 · 4daf024 · 4daf024
1 parent 5d18860
commit 4daf024
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/usvm-jvm/src/main/kotlin/org/usvm/machine/JcMachine.kt b/usvm-jvm/src/main/kotlin/org/usvm/machine/JcMachine.kt
@@ -58,7 +58,7 @@ class JcMachine(
 
     private val cfgStatistics = CfgStatisticsImpl(applicationGraph)
 
-    fun analyze(methods: List<JcMethod>, targets: List<JcTarget> = emptyList()): Pair<List<JcState>, Int>  {
+    fun analyze(methods: List<JcMethod>, targets: List<JcTarget> = emptyList()): Pair<List<JcState>, Float> {
         logger.debug("{}.analyze({})", this, methods)
         val initialStates = mutableMapOf<JcMethod, JcState>()
         methods.forEach {
@@ -204,13 +204,13 @@ class JcMachine(
             stopStrategy = stopStrategy,
         )
 
-        val percentageCoverage = coverageStatistics.getMethodCoverage(methods.single()).roundToInt()
+        val percentageCoverage = coverageStatistics.getMethodCoverage(methods.single())
 
         return statesCollector.collectedStates to percentageCoverage
 
     }
 
-    fun analyze(method: JcMethod, targets: List<JcTarget> = emptyList()): Pair<List<JcState>, Int> =
+    fun analyze(method: JcMethod, targets: List<JcTarget> = emptyList()): Pair<List<JcState>, Float> =
         analyze(listOf(method), targets)
 
     /**

diff --git a/usvm-ml-gameserver/src/main/kotlin/org.usvm/JavaMethodRunner.kt b/usvm-ml-gameserver/src/main/kotlin/org.usvm/JavaMethodRunner.kt
@@ -45,7 +45,7 @@ class JavaMethodRunner(gameMap: GameMap, oracle: Predictor<*>? = null) {
         oracle = oracle
     )
 
-    fun cover(className: String, methodName: String): Pair<List<JcState>, Int> {
+    fun cover(className: String, methodName: String): Pair<List<JcState>, Float> {
         val jcMethod = cp.getJcMethodByName(className, methodName)
 
         val (states, percentageCoverage) = JcMachine(cp, options, interpreterObserver = null).use { machine ->

diff --git a/usvm-ml-gameserver/src/main/kotlin/org.usvm/gameserver/Explorer.kt b/usvm-ml-gameserver/src/main/kotlin/org.usvm/gameserver/Explorer.kt
@@ -5,6 +5,7 @@ package org.usvm.gameserver
 import org.usvm.JavaMethodRunner
 import org.usvm.OracleImpl
 import org.usvm.statistics.BasicBlock
+import kotlin.math.floor
 
 fun randomExplorer(
     inputBody: Start,
@@ -29,7 +30,7 @@ fun randomExplorer(
     val tests = results.size - errors
 
     return GameOver(
-        percentageCoverage.toUByte(),
+        floor(percentageCoverage).toUInt(),
         test = tests.toUInt(),
         error = errors.toUInt()
     )

diff --git a/usvm-ml-gameserver/src/main/kotlin/org.usvm/gameserver/Messages.kt b/usvm-ml-gameserver/src/main/kotlin/org.usvm/gameserver/Messages.kt
@@ -61,7 +61,7 @@ sealed class OutputMessageBody
 
 @Serializable
 data class GameOver(
-    @SerialName("ActualCoverage") val percent: UByte,
+    @SerialName("ActualCoverage") val percent: UInt,
     @SerialName("TestsCount") val test: UInt,
     @SerialName("ErrorsCount") val error: UInt
 ) : OutputMessageBody()