From ec0d5304d86ddebda86c82dc0a3e2ba75356372e Mon Sep 17 00:00:00 2001 From: Marc Pasteur Date: Mon, 17 Jun 2019 14:29:36 +0200 Subject: [PATCH 1/2] Bout de code inutile dans la grammaire --- source/engine/grammar.ne | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/engine/grammar.ne b/source/engine/grammar.ne index cfaf4e574..e17a9a5d7 100644 --- a/source/engine/grammar.ne +++ b/source/engine/grammar.ne @@ -64,11 +64,6 @@ MultiplicationDivisionOperator -> "*" {% id %} MultiplicationDivision -> MultiplicationDivision _ MultiplicationDivisionOperator _ Parentheses {% operation('calculation') %} | Parentheses {% id %} -Term -> Variable {% id %} - | FilteredVariable {% id %} - | number {% id %} - | percentage {% id %} - Variable -> VariableFragment (_ Dot _ VariableFragment {% ([,,,fragment]) => fragment %}):* {% variable %} From 8250ee633b80bf1fe5f6866a5b8aa00b6b629e60 Mon Sep 17 00:00:00 2001 From: Marc Pasteur Date: Mon, 17 Jun 2019 14:32:51 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Ajout=20d'un=20test=20sur=20le=20m=C3=A9can?= =?UTF-8?q?isme=20du=20minimum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/mécanismes/le-minimum-de.yaml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/mécanismes/le-minimum-de.yaml b/test/mécanismes/le-minimum-de.yaml index d787efa46..bec665373 100644 --- a/test/mécanismes/le-minimum-de.yaml +++ b/test/mécanismes/le-minimum-de.yaml @@ -9,9 +9,26 @@ taux: 9% exemples: - - nom: - situation: - valeur attendue: 0.9 + - valeur attendue: 0.9 + + +- nom: assiette + question: Mon assiette + +- test: Minimum avec variables + formule: + le minimum de: + - multiplication: + assiette: assiette + taux: 1% + - multiplication: + assiette: assiette + taux: 9% + + exemples: + - situation: + assiette: 1000 + valeur attendue: 10 # TODO