fix for csv output in cpp runtime

Author: niklwors

SimulationRuntime/cpp/Include/Core/DataExchange/Policies/MatfileWriter.h

@@ -753,7 +753,7 @@ class MatFileWriter : public ContainerManager
         */
              size_t nInt = get<1>(v_list).size();
         std::transform(get<2>(v_list).begin(), get<2>(v_list).end(), get<2>(neg_v_list).begin(),
-            doubleHelpMatrix+nReal+nInt, WriteOutputVarBool());
+            doubleHelpMatrix+nReal+nInt, WriteOutputVar<bool>());
 
         // write matrix to file
         writeMatVer4Matrix("data_2", uiVarCount, _uiValueCount, _doubleMatrixData2, sizeof(double));

SimulationRuntime/cpp/Include/Core/DataExchange/Policies/TextfileWriter.h

@@ -113,13 +113,18 @@ class TextFileWriter : public ContainerManager
     {
         _output_stream << get<3>(v_list) << SEPERATOR;
 
-        for (real_vars_t::const_iterator it = get<0>(v_list).begin(); it != get<0>(v_list).end(); ++it)
-            _output_stream << (*it) << SEPERATOR;
 
-        for (int_vars_t::const_iterator it = get<1>(v_list).begin(); it != get<1>(v_list).end(); ++it)
-            _output_stream << (*it) << SEPERATOR;
-        for (bool_vars_t::const_iterator it = get<2>(v_list).begin(); it != get<2>(v_list).end(); ++it)
-            _output_stream << (*it) << SEPERATOR;
+        std::transform(get<0>(v_list).begin(), get<0>(v_list).end(), get<0>(neg_v_list).begin(),
+            std::ostream_iterator<double>(_output_stream,","), WriteOutputVar<double>());
+
+
+        std::transform(get<1>(v_list).begin(), get<1>(v_list).end(), get<1>(neg_v_list).begin(),
+            std::ostream_iterator<int>(_output_stream,","), WriteOutputVar<int>());
+
+
+        std::transform(get<2>(v_list).begin(), get<2>(v_list).end(), get<2>(neg_v_list).begin(),
+           std::ostream_iterator<bool>(_output_stream,","), WriteOutputVar<bool>());
+
         _output_stream << std::endl;
     }
 

SimulationRuntime/cpp/Include/Core/DataExchange/Writer.h

@@ -99,7 +99,7 @@ struct WriteOutputVar
   @param val pointer to output variable
   @param negate if output variable is a negate alias variable
   */
-  const double operator()(const T* val, bool negate)
+  const double operator()(const T* val, const bool negate)
   {
     //if output variable is a negate alias variable, then negate output value
     if(negate)
@@ -110,16 +110,17 @@ struct WriteOutputVar
 };
 
 /**
-* Operator class to return value of a boolean variable
+* specialized bool Operator class to return value of a boolean variable
 */
-struct WriteOutputVarBool
+template < >
+struct WriteOutputVar<bool>
 {
  /**
   return value of output variable
   @param val pointer to output variable
   @param negate if output variable is a negate alias variable
   */
-  const double operator()(const bool* val, bool negate)
+  const double operator()(const bool* val, const bool negate)
   {
     //if output variable is a negate alias variable, then negate output value
     if (negate)