From 6ce553563bc795f389f639a3a8cdfe356de71441 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@debian.org>
Date: Sun, 27 Jan 2019 13:56:24 +0100
Subject: new upstream version 6.0

---
 fuzzylite/fl/imex/FllImporter.h | 48 ++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 17 deletions(-)

(limited to 'fuzzylite/fl/imex/FllImporter.h')

diff --git a/fuzzylite/fl/imex/FllImporter.h b/fuzzylite/fl/imex/FllImporter.h
index 5be41c7..055bb88 100644
--- a/fuzzylite/fl/imex/FllImporter.h
+++ b/fuzzylite/fl/imex/FllImporter.h
@@ -1,25 +1,17 @@
 /*
- Author: Juan Rada-Vilela, Ph.D.
- Copyright (C) 2010-2014 FuzzyLite Limited
- All rights reserved
+ fuzzylite (R), a fuzzy logic control library in C++.
+ Copyright (C) 2010-2017 FuzzyLite Limited. All rights reserved.
+ Author: Juan Rada-Vilela, Ph.D. <jcrada@fuzzylite.com>
 
  This file is part of fuzzylite.
 
  fuzzylite is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
+ the terms of the FuzzyLite License included with the software.
 
- fuzzylite is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with fuzzylite.  If not, see <http://www.gnu.org/licenses/>.
-
- fuzzylite™ is a trademark of FuzzyLite Limited.
+ You should have received a copy of the FuzzyLite License along with
+ fuzzylite. If not, see <http://www.fuzzylite.com/license/>.
 
+ fuzzylite is a registered trademark of FuzzyLite Limited.
  */
 
 #ifndef FL_FLLIMPORTER_H
@@ -32,18 +24,39 @@
 namespace fl {
     class TNorm;
     class SNorm;
+    class Activation;
     class Term;
     class Defuzzifier;
 
+    /**
+      The FllImporter class is an Importer that configures an Engine and its
+      components utilizing the FuzzyLite Language (FLL), see
+      [http://www.fuzzylite.com/fll-fld](http://www.fuzzylite.com/fll-fld) for
+      more information.
+
+      @author Juan Rada-Vilela, Ph.D.
+      @see FllExporter
+      @see Importer
+      @since 4.0
+      @todo parse methods returning respective instances from blocks of text
+     */
     class FL_API FllImporter : public Importer {
-    protected:
+    private:
         std::string _separator;
     public:
         explicit FllImporter(const std::string& separator = "\n");
         virtual ~FllImporter() FL_IOVERRIDE;
         FL_DEFAULT_COPY_AND_MOVE(FllImporter)
 
+        /**
+          Sets the separator of the language (default separator is a new line '\n')
+          @param separator is the separator of the language
+         */
         virtual void setSeparator(const std::string& separator);
+        /**
+          Gets the separator of the language (default separator is a new line '\n')
+          @return the separator of the language
+         */
         virtual std::string getSeparator() const;
 
         virtual std::string name() const FL_IOVERRIDE;
@@ -52,6 +65,7 @@ namespace fl {
         virtual FllImporter* clone() const FL_IOVERRIDE;
 
     protected:
+
         virtual void process(const std::string& tag, const std::string& block, Engine* engine) const;
         virtual void processInputVariable(const std::string& block, Engine* engine) const;
         virtual void processOutputVariable(const std::string& block, Engine* engine) const;
@@ -59,6 +73,7 @@ namespace fl {
 
         virtual TNorm* parseTNorm(const std::string& name) const;
         virtual SNorm* parseSNorm(const std::string& name) const;
+        virtual Activation* parseActivation(const std::string& name) const;
 
         virtual Term* parseTerm(const std::string& text, Engine* engine) const;
 
@@ -68,7 +83,6 @@ namespace fl {
 
         virtual std::pair<std::string, std::string> parseKeyValue(const std::string& text,
                 char separator = ':') const;
-        virtual std::string clean(const std::string& line) const;
 
     };
 }
-- 
cgit v1.2.3