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

added experimental changes

parent 882c69cd
......@@ -10,10 +10,10 @@ void MainProgram::Initialize() {
problem = createStochasticProblem();
assemble = createAssemble();
plots = make_unique<MultilevelPlotter>(*meshes);
mlmc = make_unique<MultilevelMonteCarlo>(initLevels, initSampleAmount, meshes,
stochField, assemble, plots);
// plots = make_unique<MultilevelPlotter>(*meshes);
//
// mlmc = make_unique<MultilevelMonteCarlo>(initLevels, initSampleAmount, meshes,
// stochField, assemble, plots);
}
void MainProgram::Run() {
......
#include "MultilevelMonteCarlo.h"
#include "MultilevelMonteCarlo.hpp"
using namespace std;
......
#ifndef MULTILEVELMONTECARLO_H
#define MULTILEVELMONTECARLO_H
#ifndef MULTILEVELMONTECARLO_HPP
#define MULTILEVELMONTECARLO_HPP
#include "utils/IndentedLogger.hpp"
#include "mc/MonteCarloElliptic.h"
#include "mc/MonteCarloTransport.h"
#include "mc/MonteCarloElliptic.hpp"
#include "mc/MonteCarloTransport.hpp"
class MultilevelMonteCarlo {
......@@ -114,4 +114,4 @@ public:
void ShowResultsOverEpsilon(const vector<double> &epsLst);
};
#endif //MULTILEVELMONTECARLO_H
#endif //MULTILEVELMONTECARLO_HPP
#include "MonteCarlo.h"
#include "MonteCarlo.hpp"
void MonteCarlo::Method() {
......
......@@ -56,8 +56,8 @@ public:
config.get("MCPlotting", plotting);
config.get("functional", functional);
coarsePlot = plots.GetPlot(l - 1);
finePlot = plots.GetPlot(l);
// coarsePlot = plots.GetPlot(l - 1);
// finePlot = plots.GetPlot(l);
config.get("MCVerbose", verbose);
logger = IndentedLogger::GetInstance();
......
#include "MonteCarloElliptic.h"
#include "MonteCarloElliptic.hpp"
using namespace std;
......
#ifndef MLMC_MONTECARLOELLIPTIC_H
#define MLMC_MONTECARLOELLIPTIC_H
#include "MonteCarlo.h"
#include "MonteCarlo.hpp"
#include "assemble/EllipticAssemble.h"
......
#include "MonteCarloTransport.h"
#include "MonteCarloTransport.hpp"
using namespace std;
......
#ifndef MLMC_MONTECARLOTRANSPORT_HPP
#define MLMC_MONTECARLOTRANSPORT_HPP
#include "MonteCarlo.h"
#include "MonteCarlo.hpp"
#include "assemble/DGTransportAssemble.h"
#include "timestepping/TimeIntegrator.h"
//#include "timestepping/TimeIntegrator2.h"
......
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