From 84ff7d20a6a25d3fb4e42f076b3d90eb888f492b Mon Sep 17 00:00:00 2001
From: Pieter Collins <pieter.collins@maastrichtuniversity.nl>
Date: Wed, 6 Nov 2024 07:24:09 +0100
Subject: [PATCH] Allowed assignment of element of ScaledFunctionPatch from
 Function or FunctionPatch.

---
 source/function/function.cpp              | 10 ++++++++--
 source/function/scaled_function_patch.hpp |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/function/function.cpp b/source/function/function.cpp
index f28d0362c..bd4027f42 100644
--- a/source/function/function.cpp
+++ b/source/function/function.cpp
@@ -396,8 +396,14 @@ template<class P, class SIG> auto Function<P,SIG>::get(SizeType i) const -> Scal
 template<class P, class SIG> Void Function<P,SIG>::set(SizeType i, ScalarFunction<P,ARG> sf) {
     ARIADNE_ASSERT(i<this->result_size());
     if constexpr (Same<ResultSizeType,SizeType>) {
-        const VectorOfScalarFunction<P,ARG>& cvf = dynamic_cast<const FunctionWrapper<VectorOfScalarFunction<P,ARG>,P,SIG>&>(this->_ptr.operator*());
-        VectorOfScalarFunction<P,ARG>& vf = const_cast<VectorOfScalarFunction<P,ARG>&>(cvf);
+        const VectorOfScalarFunction<P,ARG>* cvf =
+            dynamic_cast<const FunctionWrapper<VectorOfScalarFunction<P,ARG>,P,SIG>*>(this->_ptr.operator->());
+        if (cvf==nullptr) {
+            ARIADNE_THROW(std::runtime_error,
+                          "Function<P,RealVector(ARGS...)>::set(SizeType i, Function<P,RealScalar(ARGS...)>)",
+                          "Cannot assign to component of vector-valued function "<<(*this)<<" as it is not a VectorOfScalarFunction.");
+        }
+        VectorOfScalarFunction<P,ARG>& vf = const_cast<VectorOfScalarFunction<P,ARG>&>(*cvf);
         vf[i]=sf;
     } else {
         ARIADNE_ASSERT((Same<ResultSizeType,SizeType>));
diff --git a/source/function/scaled_function_patch.hpp b/source/function/scaled_function_patch.hpp
index 9443a43e9..0af5a80be 100644
--- a/source/function/scaled_function_patch.hpp
+++ b/source/function/scaled_function_patch.hpp
@@ -1192,6 +1192,7 @@ template<class M> class VectorScaledFunctionPatchElementReference
     , public ProvideConcreteGenericArithmeticOperators<ScaledFunctionPatch<M>, ScalarMultivariateFunction<typename M::Paradigm>>
     , public DispatchConcreteGenericAlgebraNumberOperations<ScaledFunctionPatch<M>,NumericType<M>,Number<typename M::Paradigm>>
 {
+    using P=typename M::Paradigm;
     typedef M ModelType;
     typedef typename M::NumericType NumericType;
     typedef typename M::ErrorType ErrorType;
@@ -1204,6 +1205,10 @@ template<class M> class VectorScaledFunctionPatchElementReference
     VectorScaledFunctionPatchElementReference(const VectorScaledFunctionPatchElementReference<M>& x) = default;
     Void operator=(const VectorScaledFunctionPatchElementReference<M>& x) { this->_c->set(this->_i,x._c->get(x._i)); }
     Void operator=(const ScalarScaledFunctionPatch<M>& x) { this->_c->set(this->_i,x); }
+    Void operator=(const ScalarMultivariateFunctionPatch<P> x) {
+        ScalarScaledFunctionPatch<M> sfp=factory(*this->_c).create(x); *this=sfp; }
+    Void operator=(const ScalarMultivariateFunction<P> x) {
+        ScalarScaledFunctionPatch<M> sfp=factory(*this->_c).create(x); *this=sfp; }
     ScalarScaledFunctionPatch<M> element() const { return this->_c->get(this->_i); }
     BoxDomainType const& domain() const { return this->_c->domain(); }
     const ModelType& model() const { return this->_c->_models[this->_i]; }