Merge pull request #35 from javecs/feature/simple-expr

テンプレートを指定して簡易な回答を出力しました。

Author: javecs

build.gradle

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

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

@@ -4,24 +4,25 @@ import xyz.javecs.tools.expr.Calculator
 import xyz.javecs.tools.text2expr.parsers.RuleBuilder
 import xyz.javecs.tools.text2expr.parsers.RuleRenderer
 import xyz.javecs.tools.text2expr.parsers.Variable
+import xyz.javecs.tools.text2expr.utils.TemplateLoader
 import xyz.javecs.tools.text2expr.utils.normalize
 import xyz.javecs.tools.text2expr.utils.read
 import xyz.javecs.tools.text2expr.utils.resources
 
 class Text2Expr(rulePath: String = "rules") {
     private val rules = ArrayList<RuleBuilder>()
-    private val calc = Calculator()
-    private val renderer = RuleRenderer(read("templates/reply.st"))
+    private val templates = TemplateLoader(defaultTemplate = read("templates/reply.st"))
 
     init {
-        resources(rulePath).forEach { rules.add(RuleBuilder(read(it))) }
+        resources(rulePath).forEach { rules.add(RuleBuilder(source = read(it), name = it)) }
     }
 
     fun eval(text: String, rendered: Boolean = false): String {
         rules.forEach {
             try {
                 val evaluation = it.eval(text)
                 if (evaluation.value != Double.NaN) return if (rendered) {
+                    val renderer = RuleRenderer(templates.templateOf(it.name))
                     renderer.add("variables", evaluation.variables.map { Variable(it.key, it.value) }.toList())
                     renderer.add("expr", evaluation.expr)
                     renderer.add("text", text)
@@ -33,6 +34,6 @@ class Text2Expr(rulePath: String = "rules") {
             } catch (e: Exception) {
             }
         }
-        return calc.eval(normalize(text)).value.toString()
+        return Calculator().eval(normalize(text)).value.toString()
     }
 }

src/main/kotlin/xyz/javecs/tools/text2expr/parsers/RuleBuilder.kt

@@ -7,9 +7,8 @@ import xyz.javecs.tools.text2expr.utils.normalize
 
 private val tokenizer = Tokenizer()
 data class Evaluation(val value: Number = Double.NaN, val expr: List<String> = ArrayList(), val variables: Map<String, Double> = HashMap())
-class RuleBuilder(source: String) {
+class RuleBuilder(source: String, val name: String = "") {
     private val parser = RuleParser()
-
     init {
         parser.visit(parser(source).text2expr())
     }

…/tools/text2expr/utils/TemplateConfig.kt …/tools/text2expr/utils/TemplateLoader.ktsrc/main/kotlin/xyz/javecs/tools/text2expr/utils/TemplateConfig.kt renamed to src/main/kotlin/xyz/javecs/tools/text2expr/utils/TemplateLoader.kt src/main/kotlin/xyz/javecs/tools/text2expr/utils/TemplateConfig.kt renamed to src/main/kotlin/xyz/javecs/tools/text2expr/utils/TemplateLoader.kt

@@ -5,7 +5,7 @@ import org.yaml.snakeyaml.Yaml
 data class Templates(var templates: List<RuleTemplate> = ArrayList<RuleTemplate>())
 data class RuleTemplate(var rule:String = "", var template:String = "")
 
-class TemplateConfig(path: String = "rule-template.yml", val defaultTemplate: String = "") {
+class TemplateLoader(path: String = "rule-template.yml", val defaultTemplate: String = "") {
     private val config = Yaml().loadAs(read(path), Templates::class.java)
     fun templateOf(rule:String): String {
         val item = config.templates.find { it.rule == rule }

src/main/resources/rule-template.yml

@@ -1,5 +1,3 @@
 templates:
-  - rule: default
-    template: templates/reply.st
   - rule: rules/length/mileToKilometer.txt
     template: templates/simple-expr.st

…t2expr/test/kotlin/TemplateConfigTest.kt …t2expr/test/kotlin/TemplateLoaderTest.ktsrc/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/TemplateConfigTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/TemplateLoaderTest.kt src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/TemplateConfigTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/TemplateLoaderTest.kt

@@ -1,51 +1,42 @@
 package xyz.javecs.tools.text2expr.test.kotlin
 
 import org.junit.Test
-import xyz.javecs.tools.text2expr.utils.TemplateConfig
+import xyz.javecs.tools.text2expr.utils.TemplateLoader
 import kotlin.test.assertEquals
 
-class TemplateConfigTest {
+class TemplateLoaderTest {
     @Test fun template1() {
-        val config = TemplateConfig("config/rule-template-test1.yml")
+        val config = TemplateLoader("config/rule-template-test1.yml")
         assertEquals("HELLO", config.templateOf("hello"))
         assertEquals("", config.templateOf("world"))
 
     }
 
     @Test fun template2() {
-        val config = TemplateConfig("config/rule-template-test2.yml")
+        val config = TemplateLoader("config/rule-template-test2.yml")
         assertEquals("HELLO", config.templateOf("hello"))
         assertEquals("WORLD", config.templateOf("world"))
     }
 
     @Test fun template3() {
-        val config = TemplateConfig("config/rule-template-test2.yml")
+        val config = TemplateLoader("config/rule-template-test2.yml")
         assertEquals("HELLO", config.templateOf("hello"))
         assertEquals("WORLD", config.templateOf("world"))
     }
 
     @Test fun template4() {
-        val config = TemplateConfig("config/rule-template-test1.yml", defaultTemplate = "Ok")
+        val config = TemplateLoader("config/rule-template-test1.yml", defaultTemplate = "Ok")
         assertEquals("Ok", config.templateOf("xyz"))
     }
 
     @Test fun template5() {
         val expected = """
-            |<if(variables)>
-            |<variables:{v|<v.key> = <v.value>
-            |}>
-            |<endif>
-            |<if(expr)>
-            |こうだから、
-            |<expr:{e|<e>
-            |}>
-            |<endif>
             |答えは、
             |<value>
             |
             """.trimMargin("|")
-        val config = TemplateConfig()
-        assertEquals(expected, config.templateOf("default"))
+        val config = TemplateLoader()
+        assertEquals(expected, config.templateOf("rules/length/mileToKilometer.txt"))
     }
 
 }

…test/kotlin/arithmetic/ArithmeticTest.kt …otlin/rules/arithmetic/ArithmeticTest.ktsrc/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/arithmetic/ArithmeticTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/arithmetic/ArithmeticTest.kt src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/arithmetic/ArithmeticTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/arithmetic/ArithmeticTest.kt

@@ -1,4 +1,4 @@
-package xyz.javecs.tools.text2expr.test.kotlin
+package xyz.javecs.tools.text2expr.test.kotlin.rules.arithmetic
 
 import org.junit.Test
 import xyz.javecs.tools.text2expr.Text2Expr

…text2expr/test/kotlin/unit/LengthTest.kt …r/test/kotlin/rules/length/LengthTest.ktsrc/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/unit/LengthTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/length/LengthTest.kt src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/unit/LengthTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/length/LengthTest.kt

@@ -1,4 +1,4 @@
-package xyz.javecs.tools.text2expr.test.kotlin.unit
+package xyz.javecs.tools.text2expr.test.kotlin.rules.length
 
 import org.junit.Test
 import xyz.javecs.tools.text2expr.Text2Expr

…text2expr/test/kotlin/speed/SpeedTest.kt …xpr/test/kotlin/rules/speed/SpeedTest.ktsrc/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/speed/SpeedTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/speed/SpeedTest.kt src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/speed/SpeedTest.kt renamed to src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/rules/speed/SpeedTest.kt

@@ -1,4 +1,4 @@
-package xyz.javecs.tools.text2expr.test.kotlin.unit
+package xyz.javecs.tools.text2expr.test.kotlin.rules.speed
 
 import org.junit.Test
 import xyz.javecs.tools.text2expr.Text2Expr

src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/templates/SimpleExprTest.kt

@@ -0,0 +1,25 @@
+package xyz.javecs.tools.text2expr.test.kotlin.templates
+
+import org.junit.Test
+import xyz.javecs.tools.text2expr.Text2Expr
+import kotlin.test.assertEquals
+
+class SimpleExprTest {
+    @Test fun simpleExpr1() {
+        val expected = """
+        |答えは、
+        |151.27796
+        |
+        """.trimMargin("|")
+        val text2Expr = Text2Expr()
+        assertEquals(expected, text2Expr.eval("９４マイルは何キロメートルですか？", rendered = true))
+    }
+
+    @Test fun simpleExpr2() {
+        val expected = """
+        |151.27796
+        """.trimMargin("|")
+        val text2Expr = Text2Expr()
+        assertEquals(expected, text2Expr.eval("９４マイルは何キロメートルですか？", rendered = false))
+    }
+}