6 files changed, 32 insertions, 26 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