Updated exception handling

Author: davidhjp01

include/cosim.h

@@ -160,7 +160,7 @@ cosim_execution* cosim_execution_create(
  * \param [in] relTolerance Relative tolerance for deciding mismatch in the residual power
  * \param [in] pGain Proportional value in the PI controller
  * \param [in] iGain Integral value in the PI controller
- * \returns A pointer to a new instance of cosim_algorithm
+ * \returns A pointer to a new instance of cosim_algorithm, or NULL if an error occurred.
  */
 cosim_algorithm* cosim_ecco_algorithm_create(
     double safetyFactor,
@@ -199,6 +199,7 @@ int cosim_ecco_add_power_bond(
  * Creates a fixed step algorithm
  *  \param [in] stepSize
  *      The execution step size.
+ * \returns A pointer to a new instance of cosim_algorithm, or NULL if an error occurred.
  */
 cosim_algorithm* cosim_fixed_step_algorithm_create(cosim_duration stepSize);
 

src/cosim.cpp

@@ -171,30 +171,40 @@ cosim_algorithm* cosim_ecco_algorithm_create(
     double pGain,
     double iGain)
 {
-    cosim::ecco_algorithm_params ecco_params = {
-        safetyFactor,
-        cosim::to_duration(stepSize),
-        cosim::to_duration(minStepSize),
-        cosim::to_duration(maxStepSize),
-        minChangeRate,
-        maxChangeRate,
-        absTolerance,
-        relTolerance,
-        pGain,
-        iGain};
-
-    auto algo = std::make_unique<cosim_algorithm>();
-    algo->algorithm = std::make_shared<cosim::ecco_algorithm>(ecco_params);
-    algo->type = ECCO;
-    return algo.release();
+    try{
+        cosim::ecco_algorithm_params ecco_params = {
+            safetyFactor,
+            cosim::to_duration(stepSize),
+            cosim::to_duration(minStepSize),
+            cosim::to_duration(maxStepSize),
+            minChangeRate,
+            maxChangeRate,
+            absTolerance,
+            relTolerance,
+            pGain,
+            iGain};
+
+        auto algo = std::make_unique<cosim_algorithm>();
+        algo->algorithm = std::make_shared<cosim::ecco_algorithm>(ecco_params);
+        algo->type = ECCO;
+        return algo.release();
+    } catch (...) {
+        handle_current_exception();
+        return nullptr;
+    }
 }
 
 cosim_algorithm* cosim_fixed_step_algorithm_create(cosim_duration stepSize)
 {
-    auto algo = std::make_unique<cosim_algorithm>();
-    algo->algorithm = std::make_shared<cosim::fixed_step_algorithm>(to_duration(stepSize));
-    algo->type = FIXED_STEP;
-    return algo.release();
+    try{
+        auto algo = std::make_unique<cosim_algorithm>();
+        algo->algorithm = std::make_shared<cosim::fixed_step_algorithm>(to_duration(stepSize));
+        algo->type = FIXED_STEP;
+        return algo.release();
+    } catch (...) {
+        handle_current_exception();
+        return nullptr;
+    }
 }
 
 struct cosim_execution_s