1 files changed, 44 insertions, 33 deletions

diff --git a/examples/takagi-sugeno/octave/linear_tip_calculator.java b/examples/takagi-sugeno/octave/linear_tip_calculator.java
index 0600638..7046734 100644
--- a/examples/takagi-sugeno/octave/linear_tip_calculator.java
+++ b/examples/takagi-sugeno/octave/linear_tip_calculator.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,45 +13,55 @@ import com.fuzzylite.variable.*;
 
 public class linear_tip_calculator{
 public static void main(String[] args){
+//Code automatically generated with fuzzylite 6.0.
+
 Engine engine = new Engine();
-engine.setName("Linear-Tip-Calculator");
-
-InputVariable inputVariable1 = new InputVariable();
-inputVariable1.setEnabled(true);
-inputVariable1.setName("FoodQuality");
-inputVariable1.setRange(1.000, 10.000);
-inputVariable1.addTerm(new Trapezoid("Bad", 0.000, 1.000, 3.000, 7.000));
-inputVariable1.addTerm(new Trapezoid("Good", 3.000, 7.000, 10.000, 11.000));
-engine.addInputVariable(inputVariable1);
-
-InputVariable inputVariable2 = new InputVariable();
-inputVariable2.setEnabled(true);
-inputVariable2.setName("Service");
-inputVariable2.setRange(1.000, 10.000);
-inputVariable2.addTerm(new Trapezoid("Bad", 0.000, 1.000, 3.000, 7.000));
-inputVariable2.addTerm(new Trapezoid("Good", 3.000, 7.000, 10.000, 11.000));
-engine.addInputVariable(inputVariable2);
-
-OutputVariable outputVariable = new OutputVariable();
-outputVariable.setEnabled(true);
-outputVariable.setName("Tip");
-outputVariable.setRange(10.000, 20.000);
-outputVariable.fuzzyOutput().setAccumulation(null);
-outputVariable.setDefuzzifier(new WeightedAverage("TakagiSugeno"));
-outputVariable.setDefaultValue(Double.NaN);
-outputVariable.setLockPreviousOutputValue(false);
-outputVariable.setLockOutputValueInRange(false);
-outputVariable.addTerm(Linear.create("TenPercent", engine, 0.000, 0.000, 10.000));
-outputVariable.addTerm(Linear.create("FifteenPercent", engine, 0.000, 0.000, 15.000));
-outputVariable.addTerm(Linear.create("TwentyPercent", engine, 0.000, 0.000, 20.000));
-engine.addOutputVariable(outputVariable);
+engine.setName("linear_tip_calculator");
+engine.setDescription("");
+
+InputVariable FoodQuality = new InputVariable();
+FoodQuality.setName("FoodQuality");
+FoodQuality.setDescription("");
+FoodQuality.setEnabled(true);
+FoodQuality.setRange(1.000, 10.000);
+FoodQuality.setLockValueInRange(false);
+FoodQuality.addTerm(new Trapezoid("Bad", 0.000, 1.000, 3.000, 7.000));
+FoodQuality.addTerm(new Trapezoid("Good", 3.000, 7.000, 10.000, 11.000));
+engine.addInputVariable(FoodQuality);
+
+InputVariable Service = new InputVariable();
+Service.setName("Service");
+Service.setDescription("");
+Service.setEnabled(true);
+Service.setRange(1.000, 10.000);
+Service.setLockValueInRange(false);
+Service.addTerm(new Trapezoid("Bad", 0.000, 1.000, 3.000, 7.000));
+Service.addTerm(new Trapezoid("Good", 3.000, 7.000, 10.000, 11.000));
+engine.addInputVariable(Service);
+
+OutputVariable Tip = new OutputVariable();
+Tip.setName("Tip");
+Tip.setDescription("");
+Tip.setEnabled(true);
+Tip.setRange(10.000, 20.000);
+Tip.setLockValueInRange(false);
+Tip.setAggregation(null);
+Tip.setDefuzzifier(new WeightedAverage("TakagiSugeno"));
+Tip.setDefaultValue(Double.NaN);
+Tip.setLockPreviousValue(false);
+Tip.addTerm(Linear.create("TenPercent", engine, 0.000, 0.000, 10.000));
+Tip.addTerm(Linear.create("FifteenPercent", engine, 0.000, 0.000, 15.000));
+Tip.addTerm(Linear.create("TwentyPercent", engine, 0.000, 0.000, 20.000));
+engine.addOutputVariable(Tip);
 
 RuleBlock ruleBlock = new RuleBlock();
-ruleBlock.setEnabled(true);
 ruleBlock.setName("");
+ruleBlock.setDescription("");
+ruleBlock.setEnabled(true);
 ruleBlock.setConjunction(new Minimum());
 ruleBlock.setDisjunction(null);
-ruleBlock.setActivation(null);
+ruleBlock.setImplication(null);
+ruleBlock.setActivation(new General());
 ruleBlock.addRule(Rule.parse("if FoodQuality is Bad and Service is Bad then Tip is TenPercent", engine));
 ruleBlock.addRule(Rule.parse("if FoodQuality is Bad and Service is Good then Tip is FifteenPercent", engine));
 ruleBlock.addRule(Rule.parse("if FoodQuality is Good and Service is Bad then Tip is FifteenPercent", engine));