Skip to content

Improvement: Use a sequence in the build task for sim result handling #232

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
beanbag44 merged 1 commit into from
Jan 28, 2026
Merged

Improvement: Use a sequence in the build task for sim result handling #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/main/kotlin/com/lambda/interaction/managers/breaking/BreakRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,16 @@ data class BreakRequest private constructor(
nowOrNothing: Boolean = false,
builder: (BreakRequestBuilder.() -> Unit)? = null
) = asSequence()
.map { if (it is Dependent) it.lastDependency else it }
.breakRequest(pendingInteractions, nowOrNothing, builder)

@BreakRequestDsl
@JvmName("breakRequest3")
context(automated: Automated)
fun Sequence<BuildResult>.breakRequest(
pendingInteractions: MutableCollection<BuildContext>,
nowOrNothing: Boolean = false,
builder: (BreakRequestBuilder.() -> Unit)? = null
) = map { if (it is Dependent) it.lastDependency else it }
.filterIsInstance<BreakResult.Break>()
.sorted()
.map { it.context }
Expand All @@ -152,7 +161,7 @@ data class BreakRequest private constructor(
?.let { automated.breakRequest(it, pendingInteractions, nowOrNothing, builder) }

@BreakRequestDsl
@JvmName("breakRequest3")
@JvmName("breakRequest4")
fun Automated.breakRequest(
contexts: Collection<BreakContext>,
pendingInteractions: MutableCollection<BuildContext>,
Expand Down
13 changes: 11 additions & 2 deletions src/main/kotlin/com/lambda/interaction/managers/interacting/InteractRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,16 @@ data class InteractRequest private constructor(
nowOrNothing: Boolean = false,
builder: (PlaceRequestBuilder.() -> Unit)? = null
) = asSequence()
.map { if (it is Dependent) it.lastDependency else it }
.interactRequest(pendingInteractions, nowOrNothing, builder)

@PlaceRequestDsl
@JvmName("interactRequest2")
context(automated: Automated)
fun Sequence<BuildResult>.interactRequest(
pendingInteractions: MutableCollection<BuildContext>,
nowOrNothing: Boolean = false,
builder: (PlaceRequestBuilder.() -> Unit)? = null
) = map { if (it is Dependent) it.lastDependency else it }
.filterIsInstance<InteractResult.Interact>()
.sorted()
.map { it.context }
Expand All @@ -88,7 +97,7 @@ data class InteractRequest private constructor(
?.let { automated.interactRequest(it, pendingInteractions, nowOrNothing, builder) }

@PlaceRequestDsl
@JvmName("interactRequest2")
@JvmName("interactRequest3")
fun Automated.interactRequest(
contexts: Collection<InteractContext>,
pendingInteractions: MutableCollection<BuildContext>,
Expand Down
8 changes: 6 additions & 2 deletions src/main/kotlin/com/lambda/task/tasks/BuildTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,15 @@ class BuildTask private constructor(
}

private fun AutomatedSafeContext.simulateAndProcess() {
val results = runSafeAutomated { blueprint.structure.simulate() }
val results =
blueprint.structure
.simulate()
.asSequence()

DEFAULT.drawables = results
.filterIsInstance<Drawable>()
.plus(pendingInteractions.toList())
.toList()

val viableResults = results
.filter { result ->
Expand All @@ -141,7 +145,7 @@ class BuildTask private constructor(
handleResult(bestResult, viableResults)
}

private fun AutomatedSafeContext.handleResult(result: BuildResult, allResults: List<BuildResult>) {
private fun AutomatedSafeContext.handleResult(result: BuildResult, allResults: Sequence<BuildResult>) {
if (result !is Dependent && result !is Contextual && pendingInteractions.isNotEmpty()) return

when (result) {
Expand Down