chris/YAEP
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix tests & clues (WIP)

Browse Source
This commit is contained in:
Christian Basler
2024-06-25 09:49:44 +02:00
parent 4c7cc68024
commit 593939a082
8 changed files with 175 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
composeApp/src/commonMain/kotlin/domain/clues.kt
View File

@@ -6,7 +6,8 @@ sealed class Clue {
sealed class HorizontalClue : Clue()
class NeighbourClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : HorizontalClue() {
class NeighbourClue<A : ItemClass<A>, B : ItemClass<B>>(val a: Item<A>, val b: Item<B>) :
HorizontalClue() {
private val aType = a.itemType
private val bType = b.itemType
@@ -14,6 +15,19 @@ class NeighbourClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : Horizont
val rowA = grid[aType.companion]
val rowB = grid[bType.companion]
val ia = rowA.indexOf(aType)
val ib by lazy { rowB.indexOf(bType) }
if (ia != -1) {
if (ib != -1) return !(ib == ia - 1 || ib == ia + 1)
return !(rowB.getOrNull(ia - 1).mayBe(b) ||
rowB.getOrNull(ia + 1).mayBe(b))
}
if (ib != -1) {
return !(rowA.getOrNull(ib - 1).mayBe(a) ||
rowA.getOrNull(ib + 1).mayBe(a))
}
for (i in 1 until grid.size) {
if (rowA[i - 1].mayBe(a) &&
rowB[i - 0].mayBe(b)
@@ -29,7 +43,8 @@ class NeighbourClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : Horizont
}
}
class OrderClue<C : ItemClass<C>>(val left: Item<C>, val right: Item<C>) : HorizontalClue() {
class OrderClue<L : ItemClass<L>, R : ItemClass<R>>(val left: Item<L>, val right: Item<R>) :
HorizontalClue() {
private val leftType = left.itemType
private val rightType = right.itemType
@@ -37,26 +52,92 @@ class OrderClue<C : ItemClass<C>>(val left: Item<C>, val right: Item<C>) : Horiz
val rowLeft = grid[leftType.companion]
val rowRight = grid[rightType.companion]
val iLeft = rowLeft.indexOf(leftType)
val iRight by lazy { rowRight.indexOf(rightType) }
if (iLeft != -1) {
if (iRight != -1) return iRight <= iLeft
return rowRight.indexOfLast { it.mayBe(right) } > iLeft
}
if (iRight != -1) {
return rowLeft.indexOfFirst { it.mayBe(left) } in 0 until iRight
}
return rowLeft.indexOfFirst { it.mayBe(left) } >= rowRight.indexOfLast { it.mayBe(right) }
}
}
class TripletClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>, val c: Item<C>) :
class TripletClue<A : ItemClass<A>, B : ItemClass<B>, C : ItemClass<C>>(
val a: Item<A>,
val b: Item<B>,
val c: Item<C>
) :
HorizontalClue() {
private val aType = a.itemType
private val bType = b.itemType
private val cType = c.itemType
override fun isRuleViolated(grid: Grid): Boolean {
val rowA = grid[aType.companion]
val rowB = grid[bType.companion]
val rowC = grid[cType.companion]
val rowA by lazy { grid[aType.companion] }
val rowB by lazy { grid[bType.companion] }
val rowC by lazy { grid[cType.companion] }
val ia = rowA.indexOf(aType)
val ib by lazy { rowB.indexOf(bType) }
val ic by lazy { rowC.indexOf(cType) }
if (ia != -1) {
if (ib != -1) {
when (ib) {
ia - 1 -> {
return if (ic != -1) {
ic != ia - 2
} else {
!rowC[ia - 2].mayBe(c)
}
}
ia + 1 -> {
return if (ic != -1) {
ic != ia + 2
} else {
!rowC[ia + 2].mayBe(c)
}
}
else -> return true
}
}
return when (ic) {
ia - 2 -> !rowB[ia - 1].mayBe(b)
ia + 2 -> !rowB[ia + 1].mayBe(b)
-1 -> !(rowB.getOrNull(ia - 1).mayBe(b) && rowC.getOrNull(ia - 2).mayBe(c)) &&
!(rowB.getOrNull(ia + 1).mayBe(b) && rowC.getOrNull(ia + 2).mayBe(c))
else -> true
}
}
if (ib != -1) {
if (ib == 0 || ib == rowB.size - 1) return true
return when (ic) {
-1 -> !(rowA.getOrNull(ib - 1).mayBe(a) && rowC.getOrNull(ia - 2).mayBe(c)) &&
!(rowA.getOrNull(ib + 1).mayBe(a) && rowC.getOrNull(ia + 2).mayBe(c))
ib - 1 -> rowA[ib + 1].mayBe(a)
ib + 1 -> rowA[ib - 1].mayBe(a)
else -> false
}
}
if (ic != -1) {
return !(rowB.getOrNull(ic - 1).mayBe(b) && rowA.getOrNull(ic - 2).mayBe(a)) &&
!(rowB.getOrNull(ic + 1).mayBe(b) && rowA.getOrNull(ic + 2).mayBe(a))
}
for (i in 2 until grid.size) {
if (rowA[i-2].selection == a){
return rowB[i - 1].mayBe(b) &&
rowC[i - 0].mayBe(c)
}
if (rowA[i - 2].mayBe(a) &&
rowB[i - 1].mayBe(b) &&
rowC[i - 0].mayBe(c)
@@ -73,7 +154,7 @@ class TripletClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>, val c: Item<
}
}
class SameRowClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : Clue() {
class SameColumnClue<A : ItemClass<A>, B : ItemClass<B>>(val a: Item<A>, val b: Item<B>) : Clue() {
private val aType = a.itemType
private val bType = b.itemType
@@ -81,8 +162,23 @@ class SameRowClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : Clue() {
val rowA = grid[aType.companion]
val rowB = grid[bType.companion]
val ia = rowA.indexOf(aType)
val ib by lazy { rowB.indexOf(bType) }
if (ia != -1) {
return if (ib != -1) {
ib != ia
} else {
!rowB[ia].mayBe(b)
}
}
if (ib != -1) {
return !rowA[ib].mayBe(a)
}
for (i in 0 until grid.size) {
if (rowA[i].mayBe(a) && rowB[i].mayBe(b)) {
if (!rowA[i].mayBe(a) && !rowB[i].mayBe(b)) {
return false
}
}
@@ -92,6 +188,9 @@ class SameRowClue<C : ItemClass<C>>(val a: Item<C>, val b: Item<C>) : Clue() {
class PositionClue<C : ItemClass<C>>(val item: Item<C>, val index: Int) : Clue() {
override fun isRuleViolated(grid: Grid): Boolean {
val i = grid.indexOf(item.itemType)
if (i != -1) return i != index
return grid[item].mayBe(item)
}
}