Skip to content

Commit 1aa41b9

Browse files
author
Abhijit Sarkar
committed
Solve P92 - Von Koch's conjecture
1 parent d60d6b9 commit 1aa41b9

27 files changed

+216
-38
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ P90 (**) Eight queens problem
176176

177177
[P91](misc/src/P91.scala) (**) Knight’s tour.
178178

179-
P92 (***) Von Koch’s conjecture.
179+
[P92](misc/src/P92.scala) (***) Von Koch’s conjecture.
180180

181181
P93 (***) An arithmetic puzzle.
182182

arithmetic/test/src/P31Spec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package arithmetic
22

33
import org.scalatest.funspec.AnyFunSpec
44
import org.scalatest.matchers.should.Matchers.shouldBe
5+
import org.scalatest.Inspectors.forAll
56

67
class P31Spec extends AnyFunSpec:
78

@@ -16,6 +17,6 @@ class P31Spec extends AnyFunSpec:
1617
(7, true),
1718
(11, true)
1819
)
19-
data.foreach { (n, prime) =>
20+
forAll(data) { (n, prime) =>
2021
P31.isPrime(n) shouldBe prime
2122
}

arithmetic/test/src/P35Spec.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package arithmetic
22

33
import org.scalatest.funspec.AnyFunSpec
44
import org.scalatest.matchers.should.Matchers.shouldBe
5+
import org.scalatest.Inspectors.forAll
56

67
class P35Spec extends AnyFunSpec:
78

@@ -15,6 +16,6 @@ class P35Spec extends AnyFunSpec:
1516
(315, List(3, 3, 5, 7)),
1617
(901255, List(5, 17, 23, 461))
1718
)
18-
data.foreach { (n, pf) =>
19+
forAll(data) { (n, pf) =>
1920
P35.primeFactors(n) shouldBe pf
2021
}

bintree/test/src/P55Spec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package bintree
22

3-
import scala.language.implicitConversions
3+
import org.scalatest.Inspectors.forAll
44

5+
import scala.language.implicitConversions
56
import org.scalatest.funspec.AnyFunSpec
67

78
class P55Spec extends AnyFunSpec:
@@ -21,7 +22,7 @@ class P55Spec extends AnyFunSpec:
2122
)
2223
)
2324
)
24-
data.foreach { (n, expected) =>
25+
forAll(data) { (n, expected) =>
2526
val obtained = P55.cBalanced(n, 'x')
2627
assertSameTrees(obtained, expected)
2728
}

bintree/test/src/P56Spec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bintree
22

33
import scala.language.implicitConversions
44
import bintree.P56.isSymmetric
5-
5+
import org.scalatest.Inspectors.forAll
66
import org.scalatest.funspec.AnyFunSpec
77
import org.scalatest.matchers.should.Matchers.shouldBe
88

@@ -13,7 +13,7 @@ class P56Spec extends AnyFunSpec:
1313
(true, ('a', 'b', 'c'))
1414
)
1515

16-
data.foreach { (symmetric, xs) =>
16+
forAll(data) { (symmetric, xs) =>
1717
val tree = Tree.fromArray(xs)
1818
tree.isSymmetric shouldBe symmetric
1919
}

bintree/test/src/P59Spec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package bintree
22

3-
import scala.language.implicitConversions
3+
import org.scalatest.Inspectors.forAll
44

5+
import scala.language.implicitConversions
56
import org.scalatest.funspec.AnyFunSpec
67
import org.scalatest.matchers.should.Matchers.shouldBe
78

@@ -14,6 +15,6 @@ class P59Spec extends AnyFunSpec:
1415
('x', 'x', 'x', None, None, 'x', 'x'),
1516
('x', 'x', 'x', None, 'x')
1617
)
17-
expected.foreach { xs =>
18+
forAll(expected) { xs =>
1819
obtained.contains(Tree.fromArray(xs)) shouldBe true
1920
}

bintree/test/src/P61ASpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bintree
22

33
import scala.language.implicitConversions
44
import P61A.leafList
5-
5+
import org.scalatest.Inspectors.forAll
66
import org.scalatest.funspec.AnyFunSpec
77
import org.scalatest.matchers.should.Matchers.shouldBe
88

@@ -12,7 +12,7 @@ class P61ASpec extends AnyFunSpec:
1212
(('x', 'x'), List('x')),
1313
(('a', 'b', 'c', None, None, 'd', 'e'), List('b', 'd', 'e'))
1414
)
15-
data.foreach { (xs, expected) =>
15+
forAll(data) { (xs, expected) =>
1616
val obtained = Tree.fromArray(xs).leafList
1717
obtained shouldBe expected
1818
}

bintree/test/src/P61Spec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bintree
22

33
import scala.language.implicitConversions
44
import P61.leafCount
5-
5+
import org.scalatest.Inspectors.forAll
66
import org.scalatest.funspec.AnyFunSpec
77
import org.scalatest.matchers.should.Matchers.shouldBe
88

@@ -13,7 +13,7 @@ class P61Spec extends AnyFunSpec:
1313
(('a', 'b', 'c', None, None, 'd', 'e'), 3)
1414
)
1515

16-
data.foreach { (xs, expected) =>
16+
forAll(data) { (xs, expected) =>
1717
val obtained = Tree.fromArray(xs).leafCount
1818
obtained shouldBe expected
1919
}

bintree/test/src/P62BSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bintree
22

33
import scala.language.implicitConversions
44
import P62B.atLevel
5-
5+
import org.scalatest.Inspectors.forAll
66
import org.scalatest.funspec.AnyFunSpec
77
import org.scalatest.matchers.should.Matchers.shouldBe
88

@@ -12,7 +12,7 @@ class P62BSpec extends AnyFunSpec:
1212
(('a', 'b'), 1, List('a')),
1313
(('a', 'b', 'c', None, None, 'd', 'e'), 2, List('b', 'c'))
1414
)
15-
data.foreach { (xs, level, expected) =>
15+
forAll(data) { (xs, level, expected) =>
1616
val obtained = Tree.fromArray(xs).atLevel(level)
1717
obtained shouldBe expected
1818
}

bintree/test/src/P62Spec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bintree
22

33
import scala.language.implicitConversions
44
import P62.internalList
5-
5+
import org.scalatest.Inspectors.forAll
66
import org.scalatest.funspec.AnyFunSpec
77
import org.scalatest.matchers.should.Matchers.shouldBe
88

@@ -12,7 +12,7 @@ class P62Spec extends AnyFunSpec:
1212
(('a', 'b'), List('a')),
1313
(('a', 'b', 'c', None, None, 'd', 'e'), List('a', 'c'))
1414
)
15-
data.foreach { (xs, expected) =>
15+
forAll(data) { (xs, expected) =>
1616
val obtained = Tree.fromArray(xs).internalList
1717
obtained shouldBe expected
1818
}

0 commit comments

Comments
 (0)