From 6ce553563bc795f389f639a3a8cdfe356de71441 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@debian.org>
Date: Sun, 27 Jan 2019 13:56:24 +0100
Subject: new upstream version 6.0

---
 .../takagi-sugeno/octave/sugeno_tip_calculator.fll    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'examples/takagi-sugeno/octave/sugeno_tip_calculator.fll')

diff --git a/examples/takagi-sugeno/octave/sugeno_tip_calculator.fll b/examples/takagi-sugeno/octave/sugeno_tip_calculator.fll
index 611d6eb..1b51806 100644
--- a/examples/takagi-sugeno/octave/sugeno_tip_calculator.fll
+++ b/examples/takagi-sugeno/octave/sugeno_tip_calculator.fll
@@ -1,44 +1,46 @@
-Engine: Sugeno-Tip-Calculator
+Engine: sugeno_tip_calculator
 InputVariable: FoodQuality
   enabled: true
   range: 1.000 10.000
+  lock-range: false
   term: Bad Trapezoid 0.000 1.000 3.000 7.000
   term: Good Trapezoid 3.000 7.000 10.000 11.000
 InputVariable: Service
   enabled: true
   range: 1.000 10.000
+  lock-range: false
   term: Bad Trapezoid 0.000 1.000 3.000 7.000
   term: Good Trapezoid 3.000 7.000 10.000 11.000
 OutputVariable: CheapTip
   enabled: true
   range: 5.000 25.000
-  accumulation: none
+  lock-range: false
+  aggregation: none
   defuzzifier: WeightedAverage TakagiSugeno
   default: nan
   lock-previous: false
-  lock-range: false
   term: Low Constant 10.000
   term: Medium Constant 15.000
   term: High Constant 20.000
 OutputVariable: AverageTip
   enabled: true
   range: 5.000 25.000
-  accumulation: none
+  lock-range: false
+  aggregation: none
   defuzzifier: WeightedAverage TakagiSugeno
   default: nan
   lock-previous: false
-  lock-range: false
   term: Low Constant 10.000
   term: Medium Constant 15.000
   term: High Constant 20.000
 OutputVariable: GenerousTip
   enabled: true
   range: 5.000 25.000
-  accumulation: none
+  lock-range: false
+  aggregation: none
   defuzzifier: WeightedAverage TakagiSugeno
   default: nan
   lock-previous: false
-  lock-range: false
   term: Low Constant 10.000
   term: Medium Constant 15.000
   term: High Constant 20.000
@@ -46,7 +48,8 @@ RuleBlock:
   enabled: true
   conjunction: EinsteinProduct
   disjunction: none
-  activation: none
+  implication: none
+  activation: General
   rule: if FoodQuality is extremely Bad and Service is extremely Bad then CheapTip is extremely Low and AverageTip is very Low and GenerousTip is Low
   rule: if FoodQuality is Good and Service is extremely Bad then CheapTip is Low and AverageTip is Low and GenerousTip is Medium
   rule: if FoodQuality is very Good and Service is very Bad then CheapTip is Low and AverageTip is Medium and GenerousTip is High
-- 
cgit v1.2.3