Function: revert evaluate(const std::map&)

fuzzylite · Mar 8, 2024 · 2c5a788 · 2c5a788
1 parent dbcf314
commit 2c5a788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/fuzzylite/term/Function.h b/fuzzylite/term/Function.h
@@ -181,9 +181,7 @@ namespace fuzzylite {
               @return a fl::scalar indicating the result of the evaluation of
               the node
              */
-            virtual scalar
-            evaluate(const std::map<std::string, scalar>& variables = std::map<std::string, scalar>()) const;
-            virtual scalar evaluate(const std::map<std::string, scalar>* variables) const;
+            virtual scalar evaluate(const std::map<std::string, scalar>* variables = fl::null) const;
 
             /**
              Computes the size of the subtree under the given node. The complexity

diff --git a/src/term/Function.cpp b/src/term/Function.cpp
@@ -187,10 +187,6 @@ namespace fuzzylite {
         return ss.str();
     }
 
-    scalar Function::Node::evaluate(const std::map<std::string, scalar>& variables) const {
-        return evaluate(&variables);
-    }
-
     scalar Function::Node::evaluate(const std::map<std::string, scalar>* variables) const {
         scalar result = fl::nan;
         if (element.get()) {
@@ -403,7 +399,8 @@ namespace fuzzylite {
         if (not _root.get())
             throw Exception("[function error] function <" + _formula + "> not loaded.", FL_AT);
         if (localVariables)
-            return _root->evaluate(localVariables);
+            for (auto it = localVariables->begin(); it != localVariables->end(); ++it)
+                variables[it->first] = it->second;
         return _root->evaluate(&this->variables);
     }