Skip to content

Commit

Permalink
Merge pull request #2 from jairrab/percent_support
Browse files Browse the repository at this point in the history 
percent support and callback for division by zero error
  • Loading branch information
@jairrab
jairrab authored Sep 24, 2020
2 parents f72f774 + 61ee2b8 commit 6504bb5
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 50 deletions.
3 changes: 2 additions & 1 deletion src/main/kotlin/com/github/jairrab/calc/Calculator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.github.jairrab.calc.lib.controls.entries.EntriesManager
interface Calculator {
fun press(button: CalculatorButton)
fun clear()
fun resetToNumber(number: Double)
fun pressOne()
fun pressTwo()
fun pressThree()
Expand All @@ -30,7 +31,7 @@ interface Calculator {
fun pressEquals()
fun setListener(listener: Listener)

interface Listener {
fun interface Listener {
fun onCalculatorUpdate(update: CalculatorUpdate)
}

Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/com/github/jairrab/calc/CalculatorUpdate.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.jairrab.calc

sealed class CalculatorUpdate {
object Initializing : CalculatorUpdate()
class Initializing(val number: Double) : CalculatorUpdate()

class OnUpdate(
val key: String?,
Expand All @@ -10,4 +10,8 @@ sealed class CalculatorUpdate {
) : CalculatorUpdate()

class InvalidKey(val invalidKeyType: InvalidKeyType) : CalculatorUpdate()

sealed class Error : CalculatorUpdate() {
class DivideByZero(val key: String?, val entries: List<String>) : Error()
}
}
11 changes: 4 additions & 7 deletions src/main/kotlin/com/github/jairrab/calc/driver/TestDriver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@ import com.github.jairrab.calc.CalculatorUpdate
fun main() {
val calculator = Calculator.getInstance(
calculatorType = CalculatorType.BASIC_MDAS,
initialNumber = 0.0,
listener = object : Calculator.Listener {
override fun onCalculatorUpdate(update: CalculatorUpdate) {
//See runtime logs for output
}
}
)
initialNumber = 0.0
) {
//See runtime logs for output
}

calculator.pressOne()
calculator.pressTwo()
Expand Down
8 changes: 6 additions & 2 deletions src/main/kotlin/com/github/jairrab/calc/lib/CalculatorUtility.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ internal open class CalculatorUtility(
private val controlProcessor: ControlProcessor
) : Calculator {
init {
controlProcessor.clearProcessor.initialize(initialNumber)
controlProcessor.displayManager.update(null)
resetToNumber(initialNumber)
}

override fun press(button: CalculatorButton) {
Expand Down Expand Up @@ -44,6 +43,11 @@ internal open class CalculatorUtility(
controlProcessor.displayManager.update(CalculatorButton.CLEAR)
}

final override fun resetToNumber(number: Double) {
controlProcessor.clearProcessor.initialize(number)
controlProcessor.displayManager.update(number)
}

override fun pressOne() {
controlProcessor.numberProcessor.processNumber(CalculatorButton.ONE)
controlProcessor.displayManager.update(CalculatorButton.ONE)
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/ClearProcessor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ClearProcessor(
private val entriesManager: EntriesManager
) {
fun initialize(initialNumber: Double) {
entriesManager.clear()
if (initialNumber != 0.0) {
val entry = if (initialNumber % 1 == 0.0) {
initialNumber.toInt().toString()
Expand Down
46 changes: 26 additions & 20 deletions src/main/kotlin/com/github/jairrab/calc/lib/controls/outputs/DisplayManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import com.github.jairrab.calc.Calculator
import com.github.jairrab.calc.CalculatorButton
import com.github.jairrab.calc.CalculatorType
import com.github.jairrab.calc.CalculatorUpdate
import com.github.jairrab.calc.CalculatorUpdate.Error
import com.github.jairrab.calc.lib.controls.entries.EntriesManager
import com.github.jairrab.calc.lib.mathutils.DivideByZeroException
import com.github.jairrab.calc.lib.mathutils.EquationSolver
import com.github.jairrab.calc.lib.utils.Logger.LOG

Expand All @@ -15,36 +17,40 @@ class DisplayManager private constructor(
private val entriesManager: EntriesManager,
private val equationSolver: EquationSolver
) {
fun update(button: CalculatorButton?) {
fun update(button: CalculatorButton) {
val entries = entriesManager.getEntries()

val result = when {
entriesManager.isNoEntries() -> 0.0
entriesManager.isSingleEntry() -> when {
entriesManager.isLastEntryADecimal() -> 0.0
entriesManager.isLastEntryAPercentNumber() -> entriesManager.getLastDoubleEntry()
entriesManager.isLastEntryANumber() -> entriesManager.getLastDoubleEntry()
else -> {
throw IllegalStateException("Invalid entry: ${entriesManager.getLastEntry()}")
try {
val result = when {
entriesManager.isNoEntries() -> 0.0
entriesManager.isSingleEntry() -> when {
entriesManager.isLastEntryADecimal() -> 0.0
entriesManager.isLastEntryAPercentNumber() -> entriesManager.getLastDoubleEntry()
entriesManager.isLastEntryANumber() -> entriesManager.getLastDoubleEntry()
else -> {
throw IllegalStateException("Invalid entry: ${entriesManager.getLastEntry()}")
}
}
else -> equationSolver.solve(entries)
}
else -> equationSolver.solve(entries)
}

if (button == null) {
updateListener(CalculatorUpdate.Initializing)
LOG.info("Initializing calculator")
} else {
LOG.info("Key: ${button.tag} | Entries: $entries | Result: $result")
updateListener(CalculatorUpdate.OnUpdate(button.tag, entries, result))
}

if (button == CalculatorButton.EQUALS) {
entriesManager.lastResult = result
if (button == CalculatorButton.EQUALS) {
entriesManager.lastResult = result
}
} catch (e: DivideByZeroException) {
LOG.warning("Divide by zero error")
listener?.onCalculatorUpdate(Error.DivideByZero(button.tag, entries))
}
}

fun updateListener(calculatorUpdate: CalculatorUpdate){
fun update(number: Double) {
updateListener(CalculatorUpdate.Initializing(number))
LOG.info("Initializing calculator")
}

fun updateListener(calculatorUpdate: CalculatorUpdate) {
listener?.onCalculatorUpdate(calculatorUpdate)
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/kotlin/com/github/jairrab/calc/lib/mathutils/DivideByZeroException.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.github.jairrab.calc.lib.mathutils

class DivideByZeroException:Exception("Division by zero error!")
35 changes: 21 additions & 14 deletions src/main/kotlin/com/github/jairrab/calc/lib/mathutils/calculators/BasicMdasCalculator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package com.github.jairrab.calc.lib.mathutils.calculators

import com.github.jairrab.calc.CalculatorButton.*
import com.github.jairrab.calc.lib.mathutils.DivideByZeroException
import com.github.jairrab.calc.lib.mathutils.EntriesCalculator
import com.github.jairrab.calc.lib.mathutils.OperatorUtils.isOperator
import com.github.jairrab.calc.lib.utils.trimEndChar
Expand Down Expand Up @@ -45,7 +46,7 @@ class BasicMdasCalculator : EntriesCalculator {
a += b
}
DIVISION.tag -> {
b /= getEntryWithPercentFactor(entries[i])
b /= getDivisor(entries, i)
a += b
}
else -> throw IllegalStateException("Error solving last entry")
Expand All @@ -63,7 +64,7 @@ class BasicMdasCalculator : EntriesCalculator {
b = 0.0
}
DIVISION.tag -> {
b /= getEntryWithPercentFactor(entries[i])
b /= getDivisor(entries, i)
a += b
b = 0.0
}
Expand All @@ -78,7 +79,7 @@ class BasicMdasCalculator : EntriesCalculator {
b = 0.0
}
DIVISION.tag -> {
b /= getEntryWithPercentFactor(entries[i])
b /= getDivisor(entries, i)
a += b
b = 0.0
}
Expand All @@ -88,14 +89,14 @@ class BasicMdasCalculator : EntriesCalculator {
PLUS.tag -> b = getEntryWithPercentFactor(entries[i])
MINUS.tag -> b = -getEntryWithPercentFactor(entries[i])
MULTIPLY.tag -> b *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> b /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> b /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking multiply tag")
}
DIVISION.tag -> when (entries[i - 1]) {
PLUS.tag -> b = getEntryWithPercentFactor(entries[i])
MINUS.tag -> b = -getEntryWithPercentFactor(entries[i])
MULTIPLY.tag -> b *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> b /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> b /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking division tag")
}
else -> throw IllegalStateException("Error checking next operator tag")
Expand All @@ -104,19 +105,25 @@ class BasicMdasCalculator : EntriesCalculator {
throw IllegalStateException("Error solving equation")
}

private fun getDivisor(entries: List<String>, i: Int): Double {
val divisor = getEntryWithPercentFactor(entries[i])
if (divisor == 0.0) throw DivideByZeroException()
return divisor
}

private fun getEntryWithPercentFactor(entry: String, baseNumber: Double): Double {
return if (entry.endsWith(PERCENT.tag)) {
baseNumber * entry.trimEndChar().toDouble() / 100.0
} else {
entry.toDouble()
return when {
entry == DECIMAL.tag -> 0.0
entry.endsWith(PERCENT.tag) -> baseNumber * entry.trimEndChar().toDouble() / 100.0
else -> entry.toDouble()
}
}

private fun getEntryWithPercentFactor(entry:String): Double {
return if (entry.endsWith(PERCENT.tag)) {
entry.trimEndChar().toDouble() / 100.0
} else {
entry.toDouble()
private fun getEntryWithPercentFactor(entry: String): Double {
return when {
entry == DECIMAL.tag -> 1.0
entry.endsWith(PERCENT.tag) -> entry.trimEndChar().toDouble() / 100.0
else -> entry.toDouble()
}
}
}
17 changes: 12 additions & 5 deletions src/main/kotlin/com/github/jairrab/calc/lib/mathutils/calculators/BasicNonMdasCalculator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package com.github.jairrab.calc.lib.mathutils.calculators

import com.github.jairrab.calc.CalculatorButton.*
import com.github.jairrab.calc.lib.mathutils.DivideByZeroException
import com.github.jairrab.calc.lib.mathutils.EntriesCalculator
import com.github.jairrab.calc.lib.mathutils.OperatorUtils.isOperator
import com.github.jairrab.calc.lib.utils.trimEndChar
Expand Down Expand Up @@ -40,7 +41,7 @@ class BasicNonMdasCalculator : EntriesCalculator {
PLUS.tag -> a += getEntryWithPercentFactor(entries[i], a)
MINUS.tag -> a -= getEntryWithPercentFactor(entries[i], a)
MULTIPLY.tag -> a *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getDivisor(entries, i)
else -> throw IllegalStateException("Error solving last entry")
}
return a
Expand All @@ -51,28 +52,28 @@ class BasicNonMdasCalculator : EntriesCalculator {
PLUS.tag -> a += getEntryWithPercentFactor(entries[i], a)
MINUS.tag -> a -= getEntryWithPercentFactor(entries[i], a)
MULTIPLY.tag -> a *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking plus tag")
}
MINUS.tag -> when (entries[i - 1]) {
PLUS.tag -> a += getEntryWithPercentFactor(entries[i], a)
MINUS.tag -> a -= getEntryWithPercentFactor(entries[i], a)
MULTIPLY.tag -> a *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking minus tag")
}
MULTIPLY.tag -> when (entries[i - 1]) {
PLUS.tag -> a += getEntryWithPercentFactor(entries[i])
MINUS.tag -> a -= getEntryWithPercentFactor(entries[i])
MULTIPLY.tag -> a *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking multiply tag")
}
DIVISION.tag -> when (entries[i - 1]) {
PLUS.tag -> a += getEntryWithPercentFactor(entries[i])
MINUS.tag -> a -= getEntryWithPercentFactor(entries[i])
MULTIPLY.tag -> a *= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getEntryWithPercentFactor(entries[i])
DIVISION.tag -> a /= getDivisor(entries, i)
else -> throw IllegalStateException("Error checking division tag")
}
else -> throw IllegalStateException("Error checking next operator tag")
Expand All @@ -81,6 +82,12 @@ class BasicNonMdasCalculator : EntriesCalculator {
throw IllegalStateException("Error solving equation")
}

private fun getDivisor(entries: List<String>, i: Int): Double {
val divisor = getEntryWithPercentFactor(entries[i])
if (divisor == 0.0) throw DivideByZeroException()
return divisor
}

private fun getEntryWithPercentFactor(entry: String, baseNumber: Double): Double {
return if (entry.endsWith(PERCENT.tag)) {
baseNumber * entry.trimEndChar().toDouble() / 100.0
Expand Down

0 comments on commit 6504bb5

Please sign in to comment.