Skip to content

Commit 669c3f4

Browse files
Jc approximations infrastructure (#57)
--------- Co-authored-by: Sergey Pospelov <sergeypospelov59@gmail.com>
1 parent 8cd425b commit 669c3f4

File tree

51 files changed

+1013
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1013
-401
lines changed

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Versions {
22
const val klogging = "1.8.3"
33
const val slf4j = "1.6.1"
4-
const val ksmt = "0.5.6"
4+
const val ksmt = "0.5.7"
55
const val collections = "0.3.5"
66
const val coroutines = "1.6.4"
77
const val jcdb = "1.2.0"

usvm-core/src/main/kotlin/org/usvm/statistics/CoverageStatistics.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ class CoverageStatistics<Method, Statement, State : UState<*, Method, Statement,
6767
return computeCoverage(totalCoveredStatements, totalUncoveredStatements)
6868
}
6969

70+
/**
71+
* Returns current number of covered statements of all initial methods.
72+
*/
73+
fun getTotalCoveredStatements(): Int = totalCoveredStatements
74+
7075
/**
7176
* Returns current coverage of specified method (in percents).
7277
*

usvm-core/src/main/kotlin/org/usvm/statistics/CoveredNewStatesCollector.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ class CoveredNewStatesCollector<State>(
1414
private val mutableCollectedStates = mutableListOf<State>()
1515
val collectedStates: List<State> = mutableCollectedStates
1616

17-
private var previousCoverage = coverageStatistics.getTotalCoverage()
17+
private var previousCoveredStatements = coverageStatistics.getTotalCoveredStatements()
1818

1919
override fun onStateTerminated(state: State, stateReachable: Boolean) {
20-
val currentCoverage = coverageStatistics.getTotalCoverage()
20+
val currentCoveredStatements = coverageStatistics.getTotalCoveredStatements()
2121
if (isException(state)) {
2222
mutableCollectedStates.add(state)
2323
return
2424
}
2525

26-
if (stateReachable && currentCoverage > previousCoverage) {
27-
previousCoverage = currentCoverage
26+
if (stateReachable && currentCoveredStatements > previousCoveredStatements) {
27+
previousCoveredStatements = currentCoveredStatements
2828
mutableCollectedStates.add(state)
2929
}
3030
}

0 commit comments

Comments
 (0)