Merge pull request #28 from javecs/feature/speed

時速を秒間の速度に変換しました。

Author: javecs

build.gradle

@@ -16,7 +16,7 @@ plugins {
 }
 
 group 'xyz.javecs.tools'
-version '0.0.9'
+version '0.0.10'
 
 apply plugin: 'kotlin'
 apply plugin: 'antlr'

src/main/kotlin/xyz/javecs/tools/text2expr/Text2Expr.kt

@@ -11,16 +11,14 @@ class Text2Expr(rulePath: String = "rules") {
     private val calc = Calculator()
 
     init {
-        resources(rulePath).forEach{ rules.add(RuleBuilder(read(it))) }
+        resources(rulePath).forEach { rules.add(RuleBuilder(read(it))) }
     }
 
     fun eval(text: String): String {
-        for (rule in rules) {
+        rules.forEach {
             try {
-                val evaluation = rule.eval(text)
-                if (evaluation.value != Double.NaN) {
-                    return evaluation.value.toString()
-                }
+                val evaluation = it.eval(text)
+                if (evaluation.value != Double.NaN) return evaluation.value.toString()
             } catch (e: Exception) {
             }
         }

src/main/resources/rules/speed/kilometerPerHourToMeterPerSecond.txt

@@ -0,0 +1,8 @@
+SF:時速
+x=P2:数
+SF:キロメートル|キロ|"km"
+y=P2:数
+SF:秒間
+SF:メートル|"m"
+
+(x * 1000 / 3600) * y

src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/speed/SpeedTest.kt

@@ -0,0 +1,15 @@
+package xyz.javecs.tools.text2expr.test.kotlin.unit
+
+import org.junit.Test
+import xyz.javecs.tools.text2expr.Text2Expr
+import kotlin.test.assertEquals
+
+class SpeedTest {
+
+    val text2Expr = Text2Expr()
+
+    @Test fun kilometerPerHourToMeterPerSecond() {
+        assertEquals("30.555555555555557", text2Expr.eval("時速110キロの車は1秒間に何メートル進みますか？"))
+    }
+
+}