Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add brackets to formatter

Browse Source
This commit is contained in:
Sad Ellie 2022-12-11 16:08:41 +04:00
parent 0566387d81
commit b46d799382
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/sadellie/unitto/screens/Utils.kt
View File

@ -24,6 +24,8 @@ import android.net.Uri
import com.sadellie.unitto.data.KEY_COMMA import com.sadellie.unitto.data.KEY_COMMA
import com.sadellie.unitto.data.KEY_DOT import com.sadellie.unitto.data.KEY_DOT
import com.sadellie.unitto.data.KEY_E import com.sadellie.unitto.data.KEY_E
import com.sadellie.unitto.data.KEY_LEFT_BRACKET
import com.sadellie.unitto.data.KEY_RIGHT_BRACKET
import com.sadellie.unitto.data.OPERATORS import com.sadellie.unitto.data.OPERATORS
import com.sadellie.unitto.data.preferences.OutputFormat import com.sadellie.unitto.data.preferences.OutputFormat
import com.sadellie.unitto.data.preferences.Separator import com.sadellie.unitto.data.preferences.Separator
@ -83,7 +85,7 @@ object Formatter {
// We may receive expressions // We may receive expressions
// Find all numbers in that expression // Find all numbers in that expression
val allNumbers: List<String> = input.split( val allNumbers: List<String> = input.split(
*OPERATORS.toTypedArray() *OPERATORS.toTypedArray(), KEY_LEFT_BRACKET, KEY_RIGHT_BRACKET
) )
allNumbers.forEach { allNumbers.forEach {

4
app/src/test/java/com/sadellie/unitto/screens/FormatterTest.kt
View File

@ -31,6 +31,7 @@ private const val INCOMPLETE_VALUE = "123456."
private const val NO_FRACTIONAL_VALUE = "123456" private const val NO_FRACTIONAL_VALUE = "123456"
private const val INCOMPLETE_EXPR = "50+123456÷8×0.8–12+" private const val INCOMPLETE_EXPR = "50+123456÷8×0.8–12+"
private const val COMPLETE_EXPR = "50+123456÷8×0.8–12+0-√9*4^9+2×(9+8×7)" private const val COMPLETE_EXPR = "50+123456÷8×0.8–12+0-√9*4^9+2×(9+8×7)"
private const val SOME_BRACKETS = "(((((((("
class FormatterTest { class FormatterTest {
@ -45,6 +46,7 @@ class FormatterTest {
assertEquals("123 456", formatter.format(NO_FRACTIONAL_VALUE)) assertEquals("123 456", formatter.format(NO_FRACTIONAL_VALUE))
assertEquals("50+123 456÷8×0.8–12+", formatter.format(INCOMPLETE_EXPR)) assertEquals("50+123 456÷8×0.8–12+", formatter.format(INCOMPLETE_EXPR))
assertEquals("50+123 456÷8×0.8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR)) assertEquals("50+123 456÷8×0.8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR))
assertEquals("((((((((", formatter.format(SOME_BRACKETS))
} }
@Test @Test
@ -58,6 +60,7 @@ class FormatterTest {
assertEquals("123,456", formatter.format(NO_FRACTIONAL_VALUE)) assertEquals("123,456", formatter.format(NO_FRACTIONAL_VALUE))
assertEquals("50+123,456÷8×0.8–12+", formatter.format(INCOMPLETE_EXPR)) assertEquals("50+123,456÷8×0.8–12+", formatter.format(INCOMPLETE_EXPR))
assertEquals("50+123,456÷8×0.8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR)) assertEquals("50+123,456÷8×0.8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR))
assertEquals("((((((((", formatter.format(SOME_BRACKETS))
} }
@Test @Test
@ -71,6 +74,7 @@ class FormatterTest {
assertEquals("123.456", formatter.format(NO_FRACTIONAL_VALUE)) assertEquals("123.456", formatter.format(NO_FRACTIONAL_VALUE))
assertEquals("50+123.456÷8×0,8–12+", formatter.format(INCOMPLETE_EXPR)) assertEquals("50+123.456÷8×0,8–12+", formatter.format(INCOMPLETE_EXPR))
assertEquals("50+123.456÷8×0,8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR)) assertEquals("50+123.456÷8×0,8–12+0-√9*4^9+2×(9+8×7)", formatter.format(COMPLETE_EXPR))
assertEquals("((((((((", formatter.format(SOME_BRACKETS))
} }
} }