Fixed problem with evaluating multi-variable functions.

febiosoftware · Aug 22, 2024 · b8d05bf · b8d05bf
1 parent 3e5cdf9
commit b8d05bf
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/FECore/MathObject.cpp b/FECore/MathObject.cpp
@@ -212,7 +212,17 @@ double MSimpleExpression::value(const MItem* pi, const std::vector<double>& var)
 	case MSFNC:
 		{
 			return value(msfncnd(pi)->Value(), var);
-		};		
+		};
+		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), var);
+			return (f->funcptr())(d.data(), n);
+		}
+		break;
 	default:
 		assert(false);
 		return 0;