summaryrefslogtreecommitdiff
path: root/examples/original/takagi-sugeno
diff options
context:
space:
mode:
Diffstat (limited to 'examples/original/takagi-sugeno')
-rw-r--r--examples/original/takagi-sugeno/SimpleDimmer.fll7
-rw-r--r--examples/original/takagi-sugeno/approximation.fll11
-rw-r--r--examples/original/takagi-sugeno/octave/cubic_approximator.fll7
-rw-r--r--examples/original/takagi-sugeno/octave/heart_disease_risk.fll7
-rw-r--r--examples/original/takagi-sugeno/octave/linear_tip_calculator.fll7
-rw-r--r--examples/original/takagi-sugeno/octave/sugeno_tip_calculator.fll11
6 files changed, 28 insertions, 22 deletions
diff --git a/examples/original/takagi-sugeno/SimpleDimmer.fll b/examples/original/takagi-sugeno/SimpleDimmer.fll
index 15050ee..dc46ec8 100644
--- a/examples/original/takagi-sugeno/SimpleDimmer.fll
+++ b/examples/original/takagi-sugeno/SimpleDimmer.fll
@@ -1,4 +1,4 @@
-Engine: simple-dimmer
+Engine: SimpleDimmer
InputVariable: Ambient
enabled: true
range: 0.000 1.000
@@ -8,7 +8,7 @@ InputVariable: Ambient
OutputVariable: Power
enabled: true
range: 0.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -20,7 +20,8 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if Ambient is DARK then Power is HIGH
rule: if Ambient is MEDIUM then Power is MEDIUM
rule: if Ambient is BRIGHT then Power is LOW
diff --git a/examples/original/takagi-sugeno/approximation.fll b/examples/original/takagi-sugeno/approximation.fll
index 66fb813..63964dc 100644
--- a/examples/original/takagi-sugeno/approximation.fll
+++ b/examples/original/takagi-sugeno/approximation.fll
@@ -1,4 +1,4 @@
-Engine: approximation of sin(x)/x
+Engine: approximation
InputVariable: inputX
enabled: true
range: 0.000 10.000
@@ -14,7 +14,7 @@ InputVariable: inputX
OutputVariable: outputFx
enabled: true
range: -1.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: true
@@ -31,7 +31,7 @@ OutputVariable: outputFx
OutputVariable: trueFx
enabled: true
range: -1.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: true
@@ -40,7 +40,7 @@ OutputVariable: trueFx
OutputVariable: diffFx
enabled: true
range: -1.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: false
@@ -50,7 +50,8 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if inputX is NEAR_1 then outputFx is f1
rule: if inputX is NEAR_2 then outputFx is f2
rule: if inputX is NEAR_3 then outputFx is f3
diff --git a/examples/original/takagi-sugeno/octave/cubic_approximator.fll b/examples/original/takagi-sugeno/octave/cubic_approximator.fll
index 28ba40a..7d2c157 100644
--- a/examples/original/takagi-sugeno/octave/cubic_approximator.fll
+++ b/examples/original/takagi-sugeno/octave/cubic_approximator.fll
@@ -1,4 +1,4 @@
-Engine: Cubic-Approximator
+Engine: cubic_approximator
InputVariable: X
enabled: true
range: -5.000 5.000
@@ -16,7 +16,7 @@ InputVariable: X
OutputVariable: ApproxXCubed
enabled: true
range: -5.000 5.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -36,7 +36,8 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if X is AboutNegFive then ApproxXCubed is TangentatNegFive
rule: if X is AboutNegFour then ApproxXCubed is TangentatNegFour
rule: if X is AboutNegThree then ApproxXCubed is TangentatNegThree
diff --git a/examples/original/takagi-sugeno/octave/heart_disease_risk.fll b/examples/original/takagi-sugeno/octave/heart_disease_risk.fll
index c401dd4..4c60466 100644
--- a/examples/original/takagi-sugeno/octave/heart_disease_risk.fll
+++ b/examples/original/takagi-sugeno/octave/heart_disease_risk.fll
@@ -1,4 +1,4 @@
-Engine: Heart-Disease-Risk
+Engine: heart_disease_risk
InputVariable: LDLLevel
enabled: true
range: 0.000 300.000
@@ -16,7 +16,7 @@ InputVariable: HDLLevel
OutputVariable: HeartDiseaseRisk
enabled: true
range: 0.000 10.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -30,7 +30,8 @@ RuleBlock:
enabled: true
conjunction: Minimum
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if LDLLevel is Low and HDLLevel is LowHDL then HeartDiseaseRisk is MediumRisk
rule: if LDLLevel is Low and HDLLevel is ModerateHDL then HeartDiseaseRisk is LowRisk
rule: if LDLLevel is Low and HDLLevel is HighHDL then HeartDiseaseRisk is NoRisk
diff --git a/examples/original/takagi-sugeno/octave/linear_tip_calculator.fll b/examples/original/takagi-sugeno/octave/linear_tip_calculator.fll
index 34b0334..3b99fc9 100644
--- a/examples/original/takagi-sugeno/octave/linear_tip_calculator.fll
+++ b/examples/original/takagi-sugeno/octave/linear_tip_calculator.fll
@@ -1,4 +1,4 @@
-Engine: Linear-Tip-Calculator
+Engine: linear_tip_calculator
InputVariable: FoodQuality
enabled: true
range: 1.000 10.000
@@ -12,7 +12,7 @@ InputVariable: Service
OutputVariable: Tip
enabled: true
range: 10.000 20.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -24,7 +24,8 @@ RuleBlock:
enabled: true
conjunction: Minimum
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if FoodQuality is Bad and Service is Bad then Tip is TenPercent
rule: if FoodQuality is Bad and Service is Good then Tip is FifteenPercent
rule: if FoodQuality is Good and Service is Bad then Tip is FifteenPercent
diff --git a/examples/original/takagi-sugeno/octave/sugeno_tip_calculator.fll b/examples/original/takagi-sugeno/octave/sugeno_tip_calculator.fll
index 2006e71..19c5875 100644
--- a/examples/original/takagi-sugeno/octave/sugeno_tip_calculator.fll
+++ b/examples/original/takagi-sugeno/octave/sugeno_tip_calculator.fll
@@ -1,4 +1,4 @@
-Engine: Sugeno-Tip-Calculator
+Engine: sugeno_tip_calculator
InputVariable: FoodQuality
enabled: true
range: 1.000 10.000
@@ -12,7 +12,7 @@ InputVariable: Service
OutputVariable: CheapTip
enabled: true
range: 5.000 25.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -23,7 +23,7 @@ OutputVariable: CheapTip
OutputVariable: AverageTip
enabled: true
range: 5.000 25.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -34,7 +34,7 @@ OutputVariable: AverageTip
OutputVariable: GenerousTip
enabled: true
range: 5.000 25.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage TakagiSugeno
default: nan
lock-previous: false
@@ -46,7 +46,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