1212#include < string>
1313#include < vector>
1414#include < cassert>
15- using namespace std ;
1615
1716#include " encapsulation.hpp"
18- #include " ../logging.hpp"
19- #include " ../config.hpp"
2017
21- #ifndef PFASST_LOGGING_DATA_DEFAULT_FILENAME
22- #define PFASST_LOGGING_DATA_DEFAULT_FILENAME " data_values.log"
23- #endif
18+ using namespace std ;
2419
2520namespace pfasst
2621{
@@ -35,8 +30,7 @@ namespace pfasst
3530 template <typename scalar, typename time = time_precision>
3631 class VectorEncapsulation
3732 : public vector<scalar>,
38- public Encapsulation<time>,
39- public el::Loggable
33+ public Encapsulation<time>
4034 {
4135 public:
4236 // ! @{
@@ -172,14 +166,6 @@ namespace pfasst
172166 }
173167 // ! @}
174168
175- // ! @{
176- virtual void log (el::base::type::ostream_t & os) const
177- {
178- for (auto iter = this ->cbegin (); iter != this ->cend (); ++iter) {
179- os << scientific << *iter << " " ;
180- }
181- }
182- // ! @}
183169 };
184170
185171 /* *
@@ -220,36 +206,6 @@ namespace pfasst
220206 return *y.get ();
221207 }
222208
223-
224- static void init_config_options (po::options_description& opts)
225- {
226- opts.add_options ()
227- (" data_values_out" , po::value<string>(), " name of file to write 'data_values' to" )
228- ;
229- }
230-
231- static void enable_config_options (size_t index = -1 )
232- {
233- pfasst::config::Options::get_instance ()
234- .register_init_function (" Data Logger" ,
235- std::function<void (po::options_description&)>(init_config_options),
236- index);
237- }
238-
239- static void set_logfile_from_options ()
240- {
241- time_t now = time (nullptr );
242- char time_str[31 ];
243- strftime (time_str, sizeof (time_str), " %Y-%m-%dT%H-%M-%S%z" , localtime (&now));
244- el::Configurations data_values_conf;
245- data_values_conf.set (el::Level::Global, el::ConfigurationType::Format, " %msg" );
246- data_values_conf.set (el::Level::Global, el::ConfigurationType::ToFile, " true" );
247- data_values_conf.set (el::Level::Global, el::ConfigurationType::ToStandardOutput, " false" );
248- data_values_conf.set (el::Level::Global, el::ConfigurationType::Filename,
249- pfasst::config::get_value<string>(" data_values_out" ,
250- string (time_str) + PFASST_LOGGING_DATA_DEFAULT_FILENAME));
251- el::Loggers::reconfigureLogger (" data_values" , data_values_conf);
252- }
253209 } // ::pfasst::encap
254210} // ::pfasst
255211
0 commit comments