Commit 4153495

committed

add gcd

1 parent 6a017ad commit 4153495Copy full SHA for 4153495

File tree

+17

-2

lines changed

src
- main/scala/org/codecraftlabs/training
  - Rational.scala
- test/scala/org/codecraftlabs/training
  - RationalSpec.scala

+17

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`package org.codecraftlabs.training`
`2`	`2`
	`3`	`+import scala.annotation.tailrec`
	`4`	`+`
`3`	`5`	`class Rational (n: Int, d: Int) {`
`4`	`6`	`require(d != 0)`
`5`	`7`
`6`		`- val numer: Int = n`
`7`		`- val denom: Int = d`
	`8`	`+ private val g = gcd (n.abs, d.abs)`
	`9`	`+ val numer: Int = n / g`
	`10`	`+ val denom: Int = d / g`
`8`	`11`
`9`	`12`	`def this (n: Int) = this(n, 1)`
`10`	`13`
`@@ -17,4 +20,9 @@ class Rational (n: Int, d: Int) {`
`17`	`20`	`def lessThan(that: Rational): Boolean = {`
`18`	`21`	`this.numer * that.denom < that.numer * this.denom`
`19`	`22`	`}`
	`23`	`+`
	`24`	`+ @tailrec`
	`25`	`+ private def gcd(a: Int, b: Int): Int = {`
	`26`	`+ if (b == 0) a else gcd (b, a % b)`
	`27`	`+ }`
`20`	`28`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,11 @@ class RationalSpec extends AnyFlatSpec with Matchers {`
`26`	`26`	`rational.numer shouldEqual 2`
`27`	`27`	`rational.denom shouldEqual 1`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ "Initial value 3/6" should "be converted to 1/2" in {`
	`31`	`+ val rational = new Rational(3, 6)`
	`32`	`+`
	`33`	`+ rational.numer shouldEqual 1`
	`34`	`+ rational.denom shouldEqual 2`
	`35`	`+ }`
`29`	`36`	`}`

Comments

(0)