1 files changed, 67 insertions, 58 deletions
diff --git a/examples/mamdani/AllTerms.java b/examples/mamdani/AllTerms.java
index c59f9a1..6d4651d 100644
--- a/examples/mamdani/AllTerms.java
+++ b/examples/mamdani/AllTerms.java
@@ -1,4 +1,5 @@
 import com.fuzzylite.*;
+import com.fuzzylite.activation.*
 import com.fuzzylite.defuzzifier.*;
 import com.fuzzylite.factory.*;
 import com.fuzzylite.hedge.*;
@@ -12,72 +13,80 @@ import com.fuzzylite.variable.*;
 
 public class AllTerms{
 public static void main(String[] args){
+//Code automatically generated with fuzzylite 6.0.
+
 Engine engine = new Engine();
-engine.setName("qtfuzzylite");
+engine.setName("AllTerms");
+engine.setDescription("");
 
-InputVariable inputVariable = new InputVariable();
-inputVariable.setEnabled(true);
-inputVariable.setName("AllInputTerms");
-inputVariable.setRange(0.000, 6.500);
-inputVariable.addTerm(new Sigmoid("A", 0.500, -20.000));
-inputVariable.addTerm(new ZShape("B", 0.000, 1.000));
-inputVariable.addTerm(new Ramp("C", 1.000, 0.000));
-inputVariable.addTerm(new Triangle("D", 0.500, 1.000, 1.500));
-inputVariable.addTerm(new Trapezoid("E", 1.000, 1.250, 1.750, 2.000));
-inputVariable.addTerm(new Concave("F", 0.850, 0.250));
-inputVariable.addTerm(new Rectangle("G", 1.750, 2.250));
-inputVariable.addTerm(Discrete.create("H", 2.000, 0.000, 2.250, 1.000, 2.500, 0.500, 2.750, 1.000, 3.000, 0.000));
-inputVariable.addTerm(new Gaussian("I", 3.000, 0.200));
-inputVariable.addTerm(new Cosine("J", 3.250, 0.650));
-inputVariable.addTerm(new GaussianProduct("K", 3.500, 0.100, 3.300, 0.300));
-inputVariable.addTerm(new Spike("L", 3.640, 1.040));
-inputVariable.addTerm(new Bell("M", 4.000, 0.250, 3.000));
-inputVariable.addTerm(new PiShape("N", 4.000, 4.500, 4.500, 5.000));
-inputVariable.addTerm(new Concave("O", 5.650, 6.250));
-inputVariable.addTerm(new SigmoidDifference("P", 4.750, 10.000, 30.000, 5.250));
-inputVariable.addTerm(new SigmoidProduct("Q", 5.250, 20.000, -10.000, 5.750));
-inputVariable.addTerm(new Ramp("R", 5.500, 6.500));
-inputVariable.addTerm(new SShape("S", 5.500, 6.500));
-inputVariable.addTerm(new Sigmoid("T", 6.000, 20.000));
-engine.addInputVariable(inputVariable);
+InputVariable AllInputTerms = new InputVariable();
+AllInputTerms.setName("AllInputTerms");
+AllInputTerms.setDescription("");
+AllInputTerms.setEnabled(true);
+AllInputTerms.setRange(0.000, 6.500);
+AllInputTerms.setLockValueInRange(false);
+AllInputTerms.addTerm(new Sigmoid("A", 0.500, -20.000));
+AllInputTerms.addTerm(new ZShape("B", 0.000, 1.000));
+AllInputTerms.addTerm(new Ramp("C", 1.000, 0.000));
+AllInputTerms.addTerm(new Triangle("D", 0.500, 1.000, 1.500));
+AllInputTerms.addTerm(new Trapezoid("E", 1.000, 1.250, 1.750, 2.000));
+AllInputTerms.addTerm(new Concave("F", 0.850, 0.250));
+AllInputTerms.addTerm(new Rectangle("G", 1.750, 2.250));
+AllInputTerms.addTerm(Discrete.create("H", 2.000, 0.000, 2.250, 1.000, 2.500, 0.500, 2.750, 1.000, 3.000, 0.000));
+AllInputTerms.addTerm(new Gaussian("I", 3.000, 0.200));
+AllInputTerms.addTerm(new Cosine("J", 3.250, 0.650));
+AllInputTerms.addTerm(new GaussianProduct("K", 3.500, 0.100, 3.300, 0.300));
+AllInputTerms.addTerm(new Spike("L", 3.640, 1.040));
+AllInputTerms.addTerm(new Bell("M", 4.000, 0.250, 3.000));
+AllInputTerms.addTerm(new PiShape("N", 4.000, 4.500, 4.500, 5.000));
+AllInputTerms.addTerm(new Concave("O", 5.650, 6.250));
+AllInputTerms.addTerm(new SigmoidDifference("P", 4.750, 10.000, 30.000, 5.250));
+AllInputTerms.addTerm(new SigmoidProduct("Q", 5.250, 20.000, -10.000, 5.750));
+AllInputTerms.addTerm(new Ramp("R", 5.500, 6.500));
+AllInputTerms.addTerm(new SShape("S", 5.500, 6.500));
+AllInputTerms.addTerm(new Sigmoid("T", 6.000, 20.000));
+engine.addInputVariable(AllInputTerms);
 
-OutputVariable outputVariable = new OutputVariable();
-outputVariable.setEnabled(true);
-outputVariable.setName("AllOutputTerms");
-outputVariable.setRange(0.000, 6.500);
-outputVariable.fuzzyOutput().setAccumulation(new Maximum());
-outputVariable.setDefuzzifier(new Centroid(200));
-outputVariable.setDefaultValue(Double.NaN);
-outputVariable.setLockPreviousOutputValue(false);
-outputVariable.setLockOutputValueInRange(false);
-outputVariable.addTerm(new Sigmoid("A", 0.500, -20.000));
-outputVariable.addTerm(new ZShape("B", 0.000, 1.000));
-outputVariable.addTerm(new Ramp("C", 1.000, 0.000));
-outputVariable.addTerm(new Triangle("D", 0.500, 1.000, 1.500));
-outputVariable.addTerm(new Trapezoid("E", 1.000, 1.250, 1.750, 2.000));
-outputVariable.addTerm(new Concave("F", 0.850, 0.250));
-outputVariable.addTerm(new Rectangle("G", 1.750, 2.250));
-outputVariable.addTerm(Discrete.create("H", 2.000, 0.000, 2.250, 1.000, 2.500, 0.500, 2.750, 1.000, 3.000, 0.000));
-outputVariable.addTerm(new Gaussian("I", 3.000, 0.200));
-outputVariable.addTerm(new Cosine("J", 3.250, 0.650));
-outputVariable.addTerm(new GaussianProduct("K", 3.500, 0.100, 3.300, 0.300));
-outputVariable.addTerm(new Spike("L", 3.640, 1.040));
-outputVariable.addTerm(new Bell("M", 4.000, 0.250, 3.000));
-outputVariable.addTerm(new PiShape("N", 4.000, 4.500, 4.500, 5.000));
-outputVariable.addTerm(new Concave("O", 5.650, 6.250));
-outputVariable.addTerm(new SigmoidDifference("P", 4.750, 10.000, 30.000, 5.250));
-outputVariable.addTerm(new SigmoidProduct("Q", 5.250, 20.000, -10.000, 5.750));
-outputVariable.addTerm(new Ramp("R", 5.500, 6.500));
-outputVariable.addTerm(new SShape("S", 5.500, 6.500));
-outputVariable.addTerm(new Sigmoid("T", 6.000, 20.000));
-engine.addOutputVariable(outputVariable);
+OutputVariable AllOutputTerms = new OutputVariable();
+AllOutputTerms.setName("AllOutputTerms");
+AllOutputTerms.setDescription("");
+AllOutputTerms.setEnabled(true);
+AllOutputTerms.setRange(0.000, 6.500);
+AllOutputTerms.setLockValueInRange(false);
+AllOutputTerms.setAggregation(new Maximum());
+AllOutputTerms.setDefuzzifier(new Centroid(200));
+AllOutputTerms.setDefaultValue(Double.NaN);
+AllOutputTerms.setLockPreviousValue(false);
+AllOutputTerms.addTerm(new Sigmoid("A", 0.500, -20.000));
+AllOutputTerms.addTerm(new ZShape("B", 0.000, 1.000));
+AllOutputTerms.addTerm(new Ramp("C", 1.000, 0.000));
+AllOutputTerms.addTerm(new Triangle("D", 0.500, 1.000, 1.500));
+AllOutputTerms.addTerm(new Trapezoid("E", 1.000, 1.250, 1.750, 2.000));
+AllOutputTerms.addTerm(new Concave("F", 0.850, 0.250));
+AllOutputTerms.addTerm(new Rectangle("G", 1.750, 2.250));
+AllOutputTerms.addTerm(Discrete.create("H", 2.000, 0.000, 2.250, 1.000, 2.500, 0.500, 2.750, 1.000, 3.000, 0.000));
+AllOutputTerms.addTerm(new Gaussian("I", 3.000, 0.200));
+AllOutputTerms.addTerm(new Cosine("J", 3.250, 0.650));
+AllOutputTerms.addTerm(new GaussianProduct("K", 3.500, 0.100, 3.300, 0.300));
+AllOutputTerms.addTerm(new Spike("L", 3.640, 1.040));
+AllOutputTerms.addTerm(new Bell("M", 4.000, 0.250, 3.000));
+AllOutputTerms.addTerm(new PiShape("N", 4.000, 4.500, 4.500, 5.000));
+AllOutputTerms.addTerm(new Concave("O", 5.650, 6.250));
+AllOutputTerms.addTerm(new SigmoidDifference("P", 4.750, 10.000, 30.000, 5.250));
+AllOutputTerms.addTerm(new SigmoidProduct("Q", 5.250, 20.000, -10.000, 5.750));
+AllOutputTerms.addTerm(new Ramp("R", 5.500, 6.500));
+AllOutputTerms.addTerm(new SShape("S", 5.500, 6.500));
+AllOutputTerms.addTerm(new Sigmoid("T", 6.000, 20.000));
+engine.addOutputVariable(AllOutputTerms);
 
 RuleBlock ruleBlock = new RuleBlock();
-ruleBlock.setEnabled(true);
 ruleBlock.setName("");
+ruleBlock.setDescription("");
+ruleBlock.setEnabled(true);
 ruleBlock.setConjunction(new Minimum());
 ruleBlock.setDisjunction(new Maximum());
-ruleBlock.setActivation(new Minimum());
+ruleBlock.setImplication(new Minimum());
+ruleBlock.setActivation(new General());
 ruleBlock.addRule(Rule.parse("if AllInputTerms is A then AllOutputTerms is T", engine));
 ruleBlock.addRule(Rule.parse("if AllInputTerms is B then AllOutputTerms is S", engine));
 ruleBlock.addRule(Rule.parse("if AllInputTerms is C then AllOutputTerms is R", engine));