1 files changed, 59 insertions, 51 deletions

diff --git a/examples/takagi-sugeno/octave/cubic_approximator.cpp b/examples/takagi-sugeno/octave/cubic_approximator.cpp
index 6941fa5..2b9df3f 100644
--- a/examples/takagi-sugeno/octave/cubic_approximator.cpp
+++ b/examples/takagi-sugeno/octave/cubic_approximator.cpp
@@ -1,67 +1,75 @@
 #include <fl/Headers.h>
 
 int main(int argc, char** argv){
+//Code automatically generated with fuzzylite 6.0.
+
 using namespace fl;
 
 Engine* engine = new Engine;
-engine->setName("Cubic-Approximator");
+engine->setName("cubic_approximator");
+engine->setDescription("");
 
-InputVariable* inputVariable = new InputVariable;
-inputVariable->setEnabled(true);
-inputVariable->setName("X");
-inputVariable->setRange(-5.000, 5.000);
-inputVariable->addTerm(new Triangle("AboutNegFive", -6.000, -5.000, -4.000));
-inputVariable->addTerm(new Triangle("AboutNegFour", -5.000, -4.000, -3.000));
-inputVariable->addTerm(new Triangle("AboutNegThree", -4.000, -3.000, -2.000));
-inputVariable->addTerm(new Triangle("AboutNegTwo", -3.000, -2.000, -1.000));
-inputVariable->addTerm(new Triangle("AboutNegOne", -2.000, -1.000, 0.000));
-inputVariable->addTerm(new Triangle("AboutZero", -1.000, 0.000, 1.000));
-inputVariable->addTerm(new Triangle("AboutOne", 0.000, 1.000, 2.000));
-inputVariable->addTerm(new Triangle("AboutTwo", 1.000, 2.000, 3.000));
-inputVariable->addTerm(new Triangle("AboutThree", 2.000, 3.000, 4.000));
-inputVariable->addTerm(new Triangle("AboutFour", 3.000, 4.000, 5.000));
-inputVariable->addTerm(new Triangle("AboutFive", 4.000, 5.000, 6.000));
-engine->addInputVariable(inputVariable);
+InputVariable* X = new InputVariable;
+X->setName("X");
+X->setDescription("");
+X->setEnabled(true);
+X->setRange(-5.000, 5.000);
+X->setLockValueInRange(false);
+X->addTerm(new Triangle("AboutNegFive", -6.000, -5.000, -4.000));
+X->addTerm(new Triangle("AboutNegFour", -5.000, -4.000, -3.000));
+X->addTerm(new Triangle("AboutNegThree", -4.000, -3.000, -2.000));
+X->addTerm(new Triangle("AboutNegTwo", -3.000, -2.000, -1.000));
+X->addTerm(new Triangle("AboutNegOne", -2.000, -1.000, 0.000));
+X->addTerm(new Triangle("AboutZero", -1.000, 0.000, 1.000));
+X->addTerm(new Triangle("AboutOne", 0.000, 1.000, 2.000));
+X->addTerm(new Triangle("AboutTwo", 1.000, 2.000, 3.000));
+X->addTerm(new Triangle("AboutThree", 2.000, 3.000, 4.000));
+X->addTerm(new Triangle("AboutFour", 3.000, 4.000, 5.000));
+X->addTerm(new Triangle("AboutFive", 4.000, 5.000, 6.000));
+engine->addInputVariable(X);
 
-OutputVariable* outputVariable = new OutputVariable;
-outputVariable->setEnabled(true);
-outputVariable->setName("ApproxXCubed");
-outputVariable->setRange(-5.000, 5.000);
-outputVariable->fuzzyOutput()->setAccumulation(fl::null);
-outputVariable->setDefuzzifier(new WeightedAverage("TakagiSugeno"));
-outputVariable->setDefaultValue(fl::nan);
-outputVariable->setLockPreviousOutputValue(false);
-outputVariable->setLockOutputValueInRange(false);
-outputVariable->addTerm(Linear::create("TangentatNegFive", engine, 75.000, 250.000));
-outputVariable->addTerm(Linear::create("TangentatNegFour", engine, 48.000, 128.000));
-outputVariable->addTerm(Linear::create("TangentatNegThree", engine, 27.000, 54.000));
-outputVariable->addTerm(Linear::create("TangentatNegTwo", engine, 12.000, 16.000));
-outputVariable->addTerm(Linear::create("TangentatNegOne", engine, 3.000, 2.000));
-outputVariable->addTerm(Linear::create("TangentatZero", engine, 0.000, 0.000));
-outputVariable->addTerm(Linear::create("TangentatOne", engine, 3.000, -2.000));
-outputVariable->addTerm(Linear::create("TangentatTwo", engine, 12.000, -16.000));
-outputVariable->addTerm(Linear::create("TangentatThree", engine, 27.000, -54.000));
-outputVariable->addTerm(Linear::create("TangentatFour", engine, 48.000, -128.000));
-outputVariable->addTerm(Linear::create("TangentatFive", engine, 75.000, -250.000));
-engine->addOutputVariable(outputVariable);
+OutputVariable* ApproxXCubed = new OutputVariable;
+ApproxXCubed->setName("ApproxXCubed");
+ApproxXCubed->setDescription("");
+ApproxXCubed->setEnabled(true);
+ApproxXCubed->setRange(-5.000, 5.000);
+ApproxXCubed->setLockValueInRange(false);
+ApproxXCubed->setAggregation(fl::null);
+ApproxXCubed->setDefuzzifier(new WeightedAverage("TakagiSugeno"));
+ApproxXCubed->setDefaultValue(fl::nan);
+ApproxXCubed->setLockPreviousValue(false);
+ApproxXCubed->addTerm(Linear::create("TangentatNegFive", engine, 75.000, 250.000));
+ApproxXCubed->addTerm(Linear::create("TangentatNegFour", engine, 48.000, 128.000));
+ApproxXCubed->addTerm(Linear::create("TangentatNegThree", engine, 27.000, 54.000));
+ApproxXCubed->addTerm(Linear::create("TangentatNegTwo", engine, 12.000, 16.000));
+ApproxXCubed->addTerm(Linear::create("TangentatNegOne", engine, 3.000, 2.000));
+ApproxXCubed->addTerm(Linear::create("TangentatZero", engine, 0.000, 0.000));
+ApproxXCubed->addTerm(Linear::create("TangentatOne", engine, 3.000, -2.000));
+ApproxXCubed->addTerm(Linear::create("TangentatTwo", engine, 12.000, -16.000));
+ApproxXCubed->addTerm(Linear::create("TangentatThree", engine, 27.000, -54.000));
+ApproxXCubed->addTerm(Linear::create("TangentatFour", engine, 48.000, -128.000));
+ApproxXCubed->addTerm(Linear::create("TangentatFive", engine, 75.000, -250.000));
+engine->addOutputVariable(ApproxXCubed);
 
 RuleBlock* ruleBlock = new RuleBlock;
-ruleBlock->setEnabled(true);
 ruleBlock->setName("");
+ruleBlock->setDescription("");
+ruleBlock->setEnabled(true);
 ruleBlock->setConjunction(fl::null);
 ruleBlock->setDisjunction(fl::null);
-ruleBlock->setActivation(fl::null);
-ruleBlock->addRule(fl::Rule::parse("if X is AboutNegFive then ApproxXCubed is TangentatNegFive", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutNegFour then ApproxXCubed is TangentatNegFour", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutNegThree then ApproxXCubed is TangentatNegThree", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutNegTwo then ApproxXCubed is TangentatNegTwo", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutNegOne then ApproxXCubed is TangentatNegOne", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutZero then ApproxXCubed is TangentatZero", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutOne then ApproxXCubed is TangentatOne", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutTwo then ApproxXCubed is TangentatTwo", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutThree then ApproxXCubed is TangentatThree", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutFour then ApproxXCubed is TangentatFour", engine));
-ruleBlock->addRule(fl::Rule::parse("if X is AboutFive then ApproxXCubed is TangentatFive", engine));
+ruleBlock->setImplication(fl::null);
+ruleBlock->setActivation(new General);
+ruleBlock->addRule(Rule::parse("if X is AboutNegFive then ApproxXCubed is TangentatNegFive", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutNegFour then ApproxXCubed is TangentatNegFour", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutNegThree then ApproxXCubed is TangentatNegThree", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutNegTwo then ApproxXCubed is TangentatNegTwo", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutNegOne then ApproxXCubed is TangentatNegOne", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutZero then ApproxXCubed is TangentatZero", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutOne then ApproxXCubed is TangentatOne", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutTwo then ApproxXCubed is TangentatTwo", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutThree then ApproxXCubed is TangentatThree", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutFour then ApproxXCubed is TangentatFour", engine));
+ruleBlock->addRule(Rule::parse("if X is AboutFive then ApproxXCubed is TangentatFive", engine));
 engine->addRuleBlock(ruleBlock);