You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2022/07/07 08:05:13 UTC
[incubator-nlpcraft] branch NLPCRAFT-491 updated: Pizza example minor fixes.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-491
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-491 by this push:
new 4e3879e6 Pizza example minor fixes.
4e3879e6 is described below
commit 4e3879e6728a7fbe6add49670873aa5813309f46
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Thu Jul 7 11:05:07 2022 +0300
Pizza example minor fixes.
---
nlpcraft-examples/pizzeria/README.md | 2 +-
.../apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala | 1 -
.../pizzeria/components/PizzeriaOrderExtender.scala | 14 +++++++-------
.../pizzeria/components/PizzeriaOrderValidator.scala | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/nlpcraft-examples/pizzeria/README.md b/nlpcraft-examples/pizzeria/README.md
index cf21b293..d8fafb72 100644
--- a/nlpcraft-examples/pizzeria/README.md
+++ b/nlpcraft-examples/pizzeria/README.md
@@ -23,7 +23,7 @@
[](https://nlpcraft.apache.org/docs.html)
[](https://gitter.im/apache-nlpcraft/community)
-### Light Switch Example
+### Pizzeria Example
TODO:
### Documentation
TODO:
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
index d259b67f..3a46d562 100644
--- a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
+++ b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/PizzeriaModel.scala
@@ -100,7 +100,6 @@ object PizzeriaModel extends LazyLogging:
conv.clearDialog(_ => true)
mkResult(msg) -> DIALOG_EMPTY
-
private def doStop(o: Order)(using ctx: NCContext, im: NCIntentMatch): Result =
doResultWithClear(
if !o.isEmpty then s"Everything cancelled. Ask `menu` to look what you can order."
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
index 2a915ab2..005d812f 100644
--- a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
+++ b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderExtender.scala
@@ -56,7 +56,7 @@ import PizzeriaOrderExtender.*
* @param extraData
*/
case class PizzeriaOrderExtender(mainDataSeq: Seq[EntityData], extraData: EntityData) extends NCEntityMapper with LazyLogging:
- override def map(req: NCRequest, cfg: NCModelConfig, entities: List[NCEntity]): List[NCEntity] =
+ override def map(req: NCRequest, cfg: NCModelConfig, ents: List[NCEntity]): List[NCEntity] =
def combine(mainEnt: NCEntity, mainProp: String, extraEnt: NCEntity): NCEntity =
new NCPropertyMapAdapter with NCEntity:
mainEnt.keysSet.foreach(k => put(k, mainEnt.get(k)))
@@ -66,8 +66,8 @@ case class PizzeriaOrderExtender(mainDataSeq: Seq[EntityData], extraData: Entity
override val getId: String = mainEnt.getId
val mainById = mainDataSeq.map(p => p.id -> p).toMap
- val main = mutable.HashSet.empty ++ entities.filter(e => mainById.contains(e.getId))
- val extra = entities.filter(_.getId == extraData.id)
+ val main = mutable.HashSet.empty ++ ents.filter(e => mainById.contains(e.getId))
+ val extra = ents.filter(_.getId == extraData.id)
if main.nonEmpty && extra.nonEmpty && main.size >= extra.size then
val used = (main ++ extra).toSet
@@ -78,15 +78,15 @@ case class PizzeriaOrderExtender(mainDataSeq: Seq[EntityData], extraData: Entity
main -= m
main2Extra += m -> e
- val unrelated = entities.filter(e => !used.contains(e))
+ val unrelated = ents.filter(e => !used.contains(e))
val artificial = for ((m, e) <- main2Extra) yield combine(m, mainById(m.getId).property, e)
val unused = main
val res = (unrelated ++ artificial ++ unused).sortBy(_.tokens.head.getIndex)
def s(es: Iterable[NCEntity]) =
- entities.map(e => s"id=${e.getId}(${e.tokens.map(_.getIndex).mkString("[", ",", "]")})").mkString("{", ", ", "}")
- logger.debug(s"Elements mapped [input=${s(entities)}, output=${s(res)}]")
+ ents.map(e => s"id=${e.getId}(${e.tokens.map(_.getIndex).mkString("[", ",", "]")})").mkString("{", ", ", "}")
+ logger.debug(s"Elements mapped [input=${s(ents)}, output=${s(res)}]")
res
- else entities
\ No newline at end of file
+ else ents
\ No newline at end of file
diff --git a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
index ef11b744..09f653dd 100644
--- a/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
+++ b/nlpcraft-examples/pizzeria/src/main/java/org/apache/nlpcraft/examples/pizzeria/components/PizzeriaOrderValidator.scala
@@ -23,8 +23,8 @@ import org.apache.nlpcraft.*
* Rejects some invalid variant with more detailed information instead of standard rejections.
*/
class PizzeriaOrderValidator extends NCEntityValidator:
- override def validate(req: NCRequest, cfg: NCModelConfig, entities: List[NCEntity]): Unit =
- def count(id: String): Int = entities.count(_.getId == id)
+ override def validate(req: NCRequest, cfg: NCModelConfig, ents: List[NCEntity]): Unit =
+ def count(id: String): Int = ents.count(_.getId == id)
val cntPizza = count("ord:pizza")
val cntDrink = count("ord:drink")