Added missing support for evaluating functions with variable number o…

…f parameters.
febiosoftware · Aug 22, 2024 · f2b0d61 · f2b0d61
1 parent 39b9216
commit f2b0d61
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/FECore/MItem.h b/FECore/MItem.h
@@ -384,6 +384,7 @@ class MFuncND : public MNary
 	MFuncND(FUNCNPTR pf, const std::string& s, const MSequence& l) : MNary(l, MFND), m_name(s), m_pf(pf) {}
 	MItem* copy() const override;
 	const std::string& Name() const { return m_name; }
+	FUNCNPTR funcptr() const { return m_pf; }
 
 protected:
 	std::string		m_name;

diff --git a/FECore/MathObject.cpp b/FECore/MathObject.cpp
@@ -164,7 +164,17 @@ double MSimpleExpression::value(const MItem* pi) const
 	case MSFNC:
 		{
 			return value(msfncnd(pi)->Value());
-		};		
+		};
+		break;
+	case MFND:
+		{
+			const MFuncND* f = mfncnd(pi);
+			int n = f->Params();
+			vector<double> d(n, 0.0);
+			for (int i = 0; i < n; ++i) d[i] = value(f->Param(i));
+			return (f->funcptr())(d.data(), n);
+		}
+		break;
 	default:
 		assert(false);
 		return 0;