Skip to content

Improve fuzzer recursive model providers #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Markoutte merged 3 commits into from
Oct 3, 2022
Merged

Improve fuzzer recursive model providers #1039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac35ab3
Improve fuzzer recursive model providers
Markoutte Sep 30, 2022
ffa5d0e
Fix tests
Markoutte Sep 30, 2022
ad86737
Pass limit of constructor to limit total values
Markoutte Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Pass limit of constructor to limit total values
  • Loading branch information
@Markoutte
Markoutte committed Oct 3, 2022
commit ad867370ea37cf9065e1b8b58db4ca9b5aa4eb85
9 changes: 6 additions & 3 deletions utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/ArrayModelProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ class ArrayModelProvider(
recursionDepthLeft: Int = 2
) : RecursiveModelProvider(idGenerator, recursionDepthLeft) {

override fun newInstance(parentProvider: RecursiveModelProvider): RecursiveModelProvider =
ArrayModelProvider(parentProvider.idGenerator, parentProvider.recursionDepthLeft - 1)
.copySettings(parentProvider)
override fun newInstance(parentProvider: RecursiveModelProvider, constructor: ModelConstructor): RecursiveModelProvider {
val provider = ArrayModelProvider(parentProvider.idGenerator, parentProvider.recursionDepthLeft - 1)
provider.copySettings(parentProvider)
provider.totalLimit = minOf(parentProvider.totalLimit, constructor.limit)
return provider
}

override fun generateModelConstructors(
description: FuzzedMethodDescription,
Expand Down
2 changes: 1 addition & 1 deletion ...ers/src/main/kotlin/org/utbot/fuzzer/providers/CollectionWithModificationModelProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CollectionWithModificationModelProvider(
)
private var modificationCount = 7

override fun newInstance(parentProvider: RecursiveModelProvider): RecursiveModelProvider {
override fun newInstance(parentProvider: RecursiveModelProvider, constructor: ModelConstructor): RecursiveModelProvider {
val newInstance = CollectionWithModificationModelProvider(
parentProvider.idGenerator, parentProvider.recursionDepthLeft - 1
)
Expand Down
2 changes: 1 addition & 1 deletion utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/ObjectModelProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ObjectModelProvider(
idGenerator: IdentityPreservingIdGenerator<Int>,
recursionDepthLeft: Int = 2,
) : RecursiveModelProvider(idGenerator, recursionDepthLeft) {
override fun newInstance(parentProvider: RecursiveModelProvider): RecursiveModelProvider {
override fun newInstance(parentProvider: RecursiveModelProvider, constructor: ModelConstructor): RecursiveModelProvider {
val newInstance = ObjectModelProvider(parentProvider.idGenerator, parentProvider.recursionDepthLeft - 1)
newInstance.copySettings(parentProvider)
newInstance.branchingLimit = 1
Expand Down
8 changes: 4 additions & 4 deletions utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/RecursiveModelProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ abstract class RecursiveModelProvider(
/**
* Creates instance of the class on which it is called, assuming that it will be called recursively from [parentProvider]
*/
protected abstract fun newInstance(parentProvider: RecursiveModelProvider): RecursiveModelProvider
protected abstract fun newInstance(parentProvider: RecursiveModelProvider, constructor: ModelConstructor): RecursiveModelProvider

/**
* Creates [ModelProvider]s that will be used to generate values recursively. The order of elements in returned list is important:
Expand Down Expand Up @@ -101,16 +101,16 @@ abstract class RecursiveModelProvider(
neededTypes[index % neededTypes.size] // because we can repeat neededTypes several times
}
}
return fuzz(syntheticMethodDescription, nextModelProvider())
return fuzz(syntheticMethodDescription, nextModelProvider(this))
.map { createModel(it) }
.take(limit)
}

private fun nextModelProvider(): ModelProvider =
private fun nextModelProvider(constructor: ModelConstructor): ModelProvider =
if (recursionDepthLeft > 0) {
modelProviderForRecursiveCalls.map {
if (it is RecursiveModelProvider) {
it.newInstance(this)
it.newInstance(this, constructor)
} else { it }
}
} else {
Expand Down