betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

🐛 Ne pas propager le filtre de variable en variable

pull/138/head
Laurent Bossavit 2017-11-23 16:19:24 +01:00 committed by mama
parent 42e927bc53
commit 1188bb1750
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/engine/mecanisms.js
View File

@ -402,7 +402,7 @@ let doInversion = (situationGate, parsedRules, v, dottedName) => {
}
let { fixedObjectiveValue, fixedObjectiveRule } = inversion
let fx = x =>
console.log('fx') || clearDict() && evaluateNode(
clearDict() && evaluateNode(
n => dottedName === n ? x : situationGate(n),
parsedRules,
fixedObjectiveRule
@ -423,7 +423,7 @@ let doInversion = (situationGate, parsedRules, v, dottedName) => {
)
)
}
console.log('uniroot', dottedName, inversion.fixedObjective)
let tolerancePercentage = 0.00001,
// cette fonction détermine la racine d'une fonction sans faire trop d'itérations
nodeValue = uniroot(

7
source/engine/traverse.js
View File

@ -81,7 +81,7 @@ let fillFilteredVariableNode = (rules, rule) => (filter, parseResult) => {
let newSituation = name => (name == 'sys.filter' ? filter : situation(name))
return originalEval(newSituation, parsedRules, node)
}
let node = fillVariableNode(rules, rule)(parseResult)
let node = fillVariableNode(rules, rule, filter)(parseResult)
return {
...node,
evaluate: evaluateFiltered(node.evaluate)
@ -92,14 +92,13 @@ let fillFilteredVariableNode = (rules, rule) => (filter, parseResult) => {
// ne pas laisser trop longtemps cette "optimisation" qui tue l'aspect fonctionnel de l'algo
var dict
export let clearDict = () => dict = console.log('clear dict') || {}
export let clearDict = () => dict = {}
let fillVariableNode = (rules, rule) => parseResult => {
let fillVariableNode = (rules, rule, filter) => parseResult => {
let evaluate = (situation, parsedRules, node) => {
let dottedName = node.dottedName,
// On va vérifier dans le cache courant, dict, si la variable n'a pas été déjà évaluée
// En effet, l'évaluation dans le cas d'une variable qui a une formule, est coûteuse !
filter = situation('sys.filter'),
cacheName = dottedName + (filter ? '.' + filter : ''),
cached = dict[cacheName],
// make parsedRules a dict object, that also serves as a cache of evaluation ?