Fix of 'Fixed' generator for matrix values

Author: Arthoni

CMake.in.cmake

@@ -23,7 +23,7 @@ SET(OFBUILD_CUSTOM_CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.
 SET(OPENFLUID_VERSION_MAJOR 2)
 SET(OPENFLUID_VERSION_MINOR 2)
 SET(OPENFLUID_VERSION_PATCH 1)
-SET(OPENFLUID_VERSION_STATUS "beta3") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
+SET(OPENFLUID_VERSION_STATUS "beta4") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
 
 SET(OPENFLUID_VERSION_FULL "${OPENFLUID_VERSION_MAJOR}.${OPENFLUID_VERSION_MINOR}.${OPENFLUID_VERSION_PATCH}")
 

src/openfluid/machine/FixedGenerator.cpp

@@ -199,27 +199,29 @@ template <>
 void LinearFixedGenerator<openfluid::core::MatrixValue>::processVarValue(const openfluid::ware::WareParams_t& Params)
 {
   std::string VarSizeStr;
+  bool ExplicitSize = false;
   if (OPENFLUID_GetWareParameter(Params,"varsize", VarSizeStr))
   {
     LinearGeneratorMixin::processVarValue(VarSizeStr);
+    ExplicitSize = true;
   }
   std::string StringVarValue;
   if (!OPENFLUID_GetWareParameter(Params,"fixedvalue",StringVarValue))
   {
-    throw openfluid::base::FrameworkException(OPENFLUID_CODE_LOCATION,"missing fixed vector value for generator");
+    throw openfluid::base::FrameworkException(OPENFLUID_CODE_LOCATION,"missing fixed matrix value for generator");
   }
   if (openfluid::core::StringValue(StringVarValue).guessTypeConversion() == openfluid::core::Value::MATRIX)
   {
     openfluid::core::MatrixValue MV;
     if (!OPENFLUID_GetWareParameter(Params,"fixedvalue",MV))
     {
       throw openfluid::base::FrameworkException(OPENFLUID_CODE_LOCATION,
-                                                "badly formatted fixed vector value for generator");
+                                                "badly formatted fixed matrix value for generator");
     }
-    if (MV.getRowsNbr() != m_VarDimensions.Rows || MV.getColsNbr() != m_VarDimensions.Cols)
+    if (ExplicitSize && (MV.getRowsNbr() != m_VarDimensions.Rows || MV.getColsNbr() != m_VarDimensions.Cols))
     {
       throw openfluid::base::FrameworkException(OPENFLUID_CODE_LOCATION,
-                                                "wrong size for fixed vector value for generator");
+                                                "wrong size for fixed matrix value for generator");
     }
     m_VarValue = MV;
   }

src/openfluid/machine/tests/Generator_TEST.cpp

@@ -521,3 +521,38 @@ BOOST_AUTO_TEST_CASE(check_fixed_vector)
     BOOST_REQUIRE_THROW(TS.wholeSimulation(), openfluid::base::FrameworkException);
   }
 }
+
+
+BOOST_AUTO_TEST_CASE(check_fixed_matrix)
+{
+  openfluid::machine::GeneratorSpecs Specs{openfluid::fluidx::GeneratorDescriptor::GeneratorMethod::FIXED, 
+                                           {{"SU","a"}}, 
+                                           openfluid::core::Value::MATRIX};
+  {
+    // TEST MATRIX
+    std::cout << "checking fixed matrix " << std::endl;
+    openfluid::ware::WareParams_t Params = {{"deltat", "0"}, {"fixedvalue", "[[3,2],[5,4]]"}};
+
+    TestSimulation TS;
+    TS.defaultSetup();
+    TS.addGenerator(Specs, Params);
+    TS.wholeSimulation(); 
+
+    const auto Matrix = TS.getLatestValue("SU", 1, "a").value()->asMatrixValue();
+    BOOST_REQUIRE_CLOSE(Matrix.get(1,1), 4, 0.00001);
+  }
+
+  {
+    // TEST VECTOR CELLS FROM VAL
+    std::cout << "checking fixed matrix CELLS FROM VAL" << std::endl;
+    openfluid::ware::WareParams_t Params = {{"deltat", "0"}, {"fixedvalue", "2.4"}, {"varsize","[3,6]"}};
+
+    TestSimulation TS;
+    TS.defaultSetup();
+    TS.addGenerator(Specs, Params);
+    TS.wholeSimulation(); 
+    
+    const auto Matrix = TS.getLatestValue("SU", 1, "a").value()->asMatrixValue();
+    BOOST_REQUIRE_CLOSE(Matrix.get(1,1), 2.4, 0.00001);
+  }
+}