Commit dfa02e50 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

fixed imports

parent ada2860c
Pipeline #87145 failed with stages
in 2 minutes and 28 seconds
#ifndef MLMC__MULTILEVELMONTECARLO__HPP #ifndef MLMC__MULTILEVELMONTECARLO__HPP
#define MLMC__MULTILEVELMONTECARLO__HPP #define MLMC__MULTILEVELMONTECARLO__HPP
#include "m++.h"
class IndentedLogger { class IndentedLogger {
static IndentedLogger *instance; static IndentedLogger *instance;
......
#ifndef _LAPLACE_H_ #ifndef _LAPLACE_H_
#define _LAPLACE_H_ #define _LAPLACE_H_
#include "m++.h"
#include "problem/StochasticEllipticProblem.hpp" #include "problem/StochasticEllipticProblem.hpp"
#include "discretization/Discretization.h"
#include "Assemble.h"
#include "elements/Elements.h"
#include <memory> #include <memory>
......
#ifndef MLMC_MC_HPP #ifndef MLMC_MC_HPP
#define MLMC_MC_HPP #define MLMC_MC_HPP
#include "m++.h"
#include "stochastics/StochasticField.h" #include "stochastics/StochasticField.h"
#include "utils/IndentedLogger.hpp" #include "utils/IndentedLogger.hpp"
......
#ifndef STOCHASTICPROBLEM_HPP #ifndef STOCHASTICPROBLEM_HPP
#define STOCHASTICPROBLEM_HPP #define STOCHASTICPROBLEM_HPP
#include "m++.h" #include "Algebra.h"
class StochasticProblem { class StochasticProblem {
......
#ifndef M_COVARIANCEFUNCTION_H #ifndef M_COVARIANCEFUNCTION_H
#define M_COVARIANCEFUNCTION_H #define M_COVARIANCEFUNCTION_H
#include "Config.hpp"
class CovarianceFunction { class CovarianceFunction {
public: public:
double sigma = 1.0; double sigma = 1.0;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "CirculantEmbedding.h" #include "CirculantEmbedding.h"
#include "assemble/HybridEllipticAssemble.h" #include "assemble/HybridEllipticAssemble.h"
#include "problem/StochasticEllipticProblem.hpp" #include "problem/StochasticEllipticProblem.hpp"
#include "Newton.h"
class HybridFluxGenerator : public SampleGenerator { class HybridFluxGenerator : public SampleGenerator {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define MLMC_RNG_UTILITIES_HPP #define MLMC_RNG_UTILITIES_HPP
#include "sprng_cpp.h" #include "sprng_cpp.h"
#include "m++.h"
#include <math.h> #include <math.h>
#define PI 3.14159265358979323846 #define PI 3.14159265358979323846
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <utility> #include <utility>
#include "m++.h"
#include "utils/IndentedLogger.hpp" #include "utils/IndentedLogger.hpp"
#include "utils/MultilevelPlotter.hpp" #include "utils/MultilevelPlotter.hpp"
......
#ifndef MLMC__MULTILEVELMONTECARLO__HPP #ifndef MLMC__MULTILEVELMONTECARLO__HPP
#define MLMC__MULTILEVELMONTECARLO__HPP #define MLMC__MULTILEVELMONTECARLO__HPP
#include "m++.h" #include <string>
#include "TimeDate.h"
#include <vector>
class IndentedLogger { class IndentedLogger {
private: private:
static IndentedLogger *instance; static IndentedLogger *instance;
string indent = ""; std::string indent = "";
const string defaultIndent = " "; const std::string defaultIndent = " ";
vector<Date> timestamps; std::vector<Date> timestamps;
public: public:
static IndentedLogger *GetInstance() { static IndentedLogger *GetInstance() {
...@@ -29,25 +30,25 @@ public: ...@@ -29,25 +30,25 @@ public:
indent = indent.append(defaultIndent); indent = indent.append(defaultIndent);
} }
void StartMethod(const string &msg, int verbose) { void StartMethod(const std::string &msg, int verbose) {
Date start; Date start;
timestamps.push_back(start); timestamps.push_back(start);
vout (1) << indent << "<" << msg << ">" << endl; // vout (1) << indent << "<" << msg << ">" << endl;
IncreaseIndent(); IncreaseIndent();
} }
void EndMethod(int verbose) { void EndMethod(int verbose) {
DecreaseIndent(); DecreaseIndent();
vout (1) << indent << "<End after " << Date() - timestamps.back() << ">" << endl; // std::cout << indent << "<End after " << Date() - timestamps.back() << ">" << endl;
timestamps.erase(std::prev(timestamps.end())); // TODO timestamps.erase(std::prev(timestamps.end())); // TODO
} }
void InnerMsg(const string &msg, int verbose) { void InnerMsg(const std::string &msg, int verbose) {
vout (1) << indent << msg << endl; // std::cout << indent << msg << endl;
} }
void LogMsgFlush(const string &msg, int verbose) { void LogMsgFlush(const std::string &msg, int verbose) {
vout(1) << "\r" << indent << msg; // std::cout << "\r" << indent << msg;
} }
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment