summaryrefslogtreecommitdiff
path: root/examples/original
diff options
context:
space:
mode:
Diffstat (limited to 'examples/original')
-rw-r--r--examples/original/mamdani/AllTerms.fll9
-rw-r--r--examples/original/mamdani/Laundry.fll9
-rw-r--r--examples/original/mamdani/SimpleDimmer.fll9
-rw-r--r--examples/original/mamdani/SimpleDimmerInverse.fll11
-rw-r--r--examples/original/mamdani/octave/investment_portfolio.fll9
-rw-r--r--examples/original/mamdani/octave/mamdani_tip_calculator.fll11
-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
-rw-r--r--examples/original/tsukamoto/tsukamoto.fll15
13 files changed, 68 insertions, 55 deletions
diff --git a/examples/original/mamdani/AllTerms.fll b/examples/original/mamdani/AllTerms.fll
index 58d5705..bed89c8 100644
--- a/examples/original/mamdani/AllTerms.fll
+++ b/examples/original/mamdani/AllTerms.fll
@@ -1,4 +1,4 @@
-Engine: qtfuzzylite
+Engine: AllTerms
InputVariable: AllInputTerms
enabled: true
range: 0.000 6.500
@@ -25,7 +25,7 @@ InputVariable: AllInputTerms
OutputVariable: AllOutputTerms
enabled: true
range: 0.000 6.500
- accumulation: Maximum
+ aggregation: Maximum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -54,7 +54,8 @@ RuleBlock:
enabled: true
conjunction: Minimum
disjunction: Maximum
- activation: Minimum
+ implication: Minimum
+ activation: General
rule: if AllInputTerms is A then AllOutputTerms is T
rule: if AllInputTerms is B then AllOutputTerms is S
rule: if AllInputTerms is C then AllOutputTerms is R
@@ -74,4 +75,4 @@ RuleBlock:
rule: if AllInputTerms is Q then AllOutputTerms is D
rule: if AllInputTerms is R then AllOutputTerms is C
rule: if AllInputTerms is S then AllOutputTerms is B
- rule: if AllInputTerms is T then AllOutputTerms is A \ No newline at end of file
+ rule: if AllInputTerms is T then AllOutputTerms is A
diff --git a/examples/original/mamdani/Laundry.fll b/examples/original/mamdani/Laundry.fll
index cc002bb..36e67d5 100644
--- a/examples/original/mamdani/Laundry.fll
+++ b/examples/original/mamdani/Laundry.fll
@@ -12,7 +12,7 @@ InputVariable: Dirt
OutputVariable: Detergent
enabled: true
range: 0.000 80.000
- accumulation: Maximum
+ aggregation: Maximum
defuzzifier: MeanOfMaximum 500
default: nan
lock-previous: false
@@ -23,7 +23,7 @@ OutputVariable: Detergent
OutputVariable: Cycle
enabled: true
range: 0.000 20.000
- accumulation: Maximum
+ aggregation: Maximum
defuzzifier: MeanOfMaximum 500
default: nan
lock-previous: false
@@ -34,10 +34,11 @@ RuleBlock:
enabled: true
conjunction: Minimum
disjunction: Maximum
- activation: Minimum
+ implication: Minimum
+ activation: General
rule: if Load is small and Dirt is not high then Detergent is less_than_usual
rule: if Load is small and Dirt is high then Detergent is usual
rule: if Load is normal and Dirt is low then Detergent is less_than_usual
rule: if Load is normal and Dirt is high then Detergent is more_than_usual
rule: if Detergent is usual or Detergent is less_than_usual then Cycle is short
- rule: if Detergent is more_than_usual then Cycle is long \ No newline at end of file
+ rule: if Detergent is more_than_usual then Cycle is long
diff --git a/examples/original/mamdani/SimpleDimmer.fll b/examples/original/mamdani/SimpleDimmer.fll
index 3a4f8f9..ab91b72 100644
--- a/examples/original/mamdani/SimpleDimmer.fll
+++ b/examples/original/mamdani/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: Maximum
+ aggregation: Maximum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -20,7 +20,8 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: Minimum
+ implication: Minimum
+ 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 \ No newline at end of file
+ rule: if Ambient is BRIGHT then Power is LOW
diff --git a/examples/original/mamdani/SimpleDimmerInverse.fll b/examples/original/mamdani/SimpleDimmerInverse.fll
index fd6b945..3cd7a4a 100644
--- a/examples/original/mamdani/SimpleDimmerInverse.fll
+++ b/examples/original/mamdani/SimpleDimmerInverse.fll
@@ -1,4 +1,4 @@
-Engine: simple-dimmer
+Engine: SimpleDimmerInverse
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: Maximum
+ aggregation: Maximum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -19,7 +19,7 @@ OutputVariable: Power
OutputVariable: InversePower
enabled: true
range: 0.000 1.000
- accumulation: Maximum
+ aggregation: Maximum
defuzzifier: Centroid 500
default: nan
lock-previous: false
@@ -31,10 +31,11 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: Minimum
+ implication: Minimum
+ 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
rule: if Power is LOW then InversePower is HIGH
rule: if Power is MEDIUM then InversePower is MEDIUM
- rule: if Power is HIGH then InversePower is LOW \ No newline at end of file
+ rule: if Power is HIGH then InversePower is LOW
diff --git a/examples/original/mamdani/octave/investment_portfolio.fll b/examples/original/mamdani/octave/investment_portfolio.fll
index 4bb14e1..a383512 100644
--- a/examples/original/mamdani/octave/investment_portfolio.fll
+++ b/examples/original/mamdani/octave/investment_portfolio.fll
@@ -1,4 +1,4 @@
-Engine: Investment-Portfolio
+Engine: investment_portfolio
InputVariable: Age
enabled: true
range: 20.000 100.000
@@ -12,7 +12,7 @@ InputVariable: RiskTolerance
OutputVariable: PercentageInStocks
enabled: true
range: 0.000 100.000
- accumulation: EinsteinSum
+ aggregation: EinsteinSum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -24,8 +24,9 @@ RuleBlock:
enabled: true
conjunction: EinsteinProduct
disjunction: EinsteinSum
- activation: EinsteinProduct
+ implication: EinsteinProduct
+ activation: General
rule: if Age is Young or RiskTolerance is High then PercentageInStocks is AboutEightyFive
rule: if Age is Old or RiskTolerance is Low then PercentageInStocks is AboutFifteen
rule: if Age is not extremely Old and RiskTolerance is not extremely Low then PercentageInStocks is AboutFifty with 0.500
- rule: if Age is not extremely Young and RiskTolerance is not extremely High then PercentageInStocks is AboutFifty with 0.500 \ No newline at end of file
+ rule: if Age is not extremely Young and RiskTolerance is not extremely High then PercentageInStocks is AboutFifty with 0.500
diff --git a/examples/original/mamdani/octave/mamdani_tip_calculator.fll b/examples/original/mamdani/octave/mamdani_tip_calculator.fll
index b6c1920..15a94b9 100644
--- a/examples/original/mamdani/octave/mamdani_tip_calculator.fll
+++ b/examples/original/mamdani/octave/mamdani_tip_calculator.fll
@@ -1,4 +1,4 @@
-Engine: Mamdani-Tip-Calculator
+Engine: mamdani_tip_calculator
InputVariable: FoodQuality
enabled: true
range: 1.000 10.000
@@ -12,7 +12,7 @@ InputVariable: Service
OutputVariable: Tip
enabled: true
range: 0.000 30.000
- accumulation: AlgebraicSum
+ aggregation: AlgebraicSum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -23,7 +23,7 @@ OutputVariable: Tip
OutputVariable: CheckPlusTip
enabled: true
range: 1.000 1.300
- accumulation: AlgebraicSum
+ aggregation: AlgebraicSum
defuzzifier: Centroid 200
default: nan
lock-previous: false
@@ -35,8 +35,9 @@ RuleBlock:
enabled: true
conjunction: AlgebraicProduct
disjunction: Maximum
- activation: Minimum
+ implication: Minimum
+ activation: General
rule: if FoodQuality is Bad and Service is Bad then Tip is AboutTenPercent and CheckPlusTip is PlusAboutTenPercent
rule: if FoodQuality is Bad and Service is Good then Tip is AboutFifteenPercent and CheckPlusTip is PlusAboutFifteenPercent
rule: if FoodQuality is Good and Service is Bad then Tip is AboutFifteenPercent and CheckPlusTip is PlusAboutFifteenPercent
- rule: if FoodQuality is Good and Service is Good then Tip is AboutTwentyPercent and CheckPlusTip is PlusAboutTwentyPercent \ No newline at end of file
+ rule: if FoodQuality is Good and Service is Good then Tip is AboutTwentyPercent and CheckPlusTip is PlusAboutTwentyPercent
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
diff --git a/examples/original/tsukamoto/tsukamoto.fll b/examples/original/tsukamoto/tsukamoto.fll
index 1811b81..b8acf99 100644
--- a/examples/original/tsukamoto/tsukamoto.fll
+++ b/examples/original/tsukamoto/tsukamoto.fll
@@ -1,4 +1,4 @@
-Engine:
+Engine: tsukamoto
InputVariable: X
enabled: true
range: -10.000 10.000
@@ -8,7 +8,7 @@ InputVariable: X
OutputVariable: Ramps
enabled: true
range: 0.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: false
@@ -19,7 +19,7 @@ OutputVariable: Ramps
OutputVariable: Sigmoids
enabled: true
range: 0.020 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: false
@@ -30,7 +30,7 @@ OutputVariable: Sigmoids
OutputVariable: ZSShapes
enabled: true
range: 0.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: false
@@ -41,7 +41,7 @@ OutputVariable: ZSShapes
OutputVariable: Concaves
enabled: true
range: 0.000 1.000
- accumulation: none
+ aggregation: none
defuzzifier: WeightedAverage
default: nan
lock-previous: false
@@ -53,7 +53,8 @@ RuleBlock:
enabled: true
conjunction: none
disjunction: none
- activation: none
+ implication: none
+ activation: General
rule: if X is small then Ramps is a and Sigmoids is a and ZSShapes is a and Concaves is a
rule: if X is medium then Ramps is b and Sigmoids is b and ZSShapes is b and Concaves is b
- rule: if X is large then Ramps is c and Sigmoids is c and ZSShapes is c and Concaves is c \ No newline at end of file
+ rule: if X is large then Ramps is c and Sigmoids is c and ZSShapes is c and Concaves is c