Commit 91d41192 authored by Andreas Nüßing's avatar Andreas Nüßing

Merge branch 'feature/rename-conforming-fitted' into 'master'

[Conforming] rename conforming to fitted

See merge request duneuro/duneuro!50
parents f0eafd9a 1989c698
#ifndef DUNEURO_CONFORMING_EEG_FORWARD_SOLVER_HH
#define DUNEURO_CONFORMING_EEG_FORWARD_SOLVER_HH
#ifndef DUNEURO_FITTED_EEG_FORWARD_SOLVER_HH
#define DUNEURO_FITTED_EEG_FORWARD_SOLVER_HH
#include <dune/common/parametertree.hh>
......@@ -12,7 +12,7 @@
namespace duneuro
{
template <class S>
struct ConformingEEGForwardSolverTraits {
struct FittedEEGForwardSolverTraits {
static const unsigned int dimension = S::Traits::dimension;
using Solver = S;
using VolumeConductor = typename S::Traits::VolumeConductor;
......@@ -25,13 +25,13 @@ namespace duneuro
};
template <class S, class SMF>
class ConformingEEGForwardSolver : public EEGForwardSolver<ConformingEEGForwardSolver<S, SMF>,
ConformingEEGForwardSolverTraits<S>>
class FittedEEGForwardSolver
: public EEGForwardSolver<FittedEEGForwardSolver<S, SMF>, FittedEEGForwardSolverTraits<S>>
{
public:
using Traits = ConformingEEGForwardSolverTraits<S>;
using Traits = FittedEEGForwardSolverTraits<S>;
ConformingEEGForwardSolver(std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
FittedEEGForwardSolver(std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
std::shared_ptr<typename Traits::ElementSearch> search,
std::shared_ptr<typename Traits::Solver> solver)
: volumeConductor_(volumeConductor)
......@@ -106,4 +106,4 @@ namespace duneuro
};
}
#endif // DUNEURO_CONFORMING_EEG_FORWARD_SOLVER_HH
#endif // DUNEURO_FITTED_EEG_FORWARD_SOLVER_HH
#ifndef DUNEURO_CONFORMING_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_CONFORMING_TRANSFER_MATRIX_SOLVER_HH
#ifndef DUNEURO_FITTED_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_FITTED_TRANSFER_MATRIX_SOLVER_HH
#include <dune/common/parametertree.hh>
#include <dune/common/timer.hh>
......@@ -13,7 +13,7 @@
namespace duneuro
{
template <class S>
struct ConformingTransferMatrixSolverTraits {
struct FittedTransferMatrixSolverTraits {
using Solver = S;
static const unsigned int dimension = S::Traits::dimension;
using VolumeConductor = typename S::Traits::VolumeConductor;
......@@ -27,13 +27,12 @@ namespace duneuro
};
template <class S>
class ConformingTransferMatrixSolver
class FittedTransferMatrixSolver
{
public:
using Traits = ConformingTransferMatrixSolverTraits<S>;
using Traits = FittedTransferMatrixSolverTraits<S>;
ConformingTransferMatrixSolver(
std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
FittedTransferMatrixSolver(std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
std::shared_ptr<typename Traits::Solver> solver)
: volumeConductor_(volumeConductor)
, solver_(solver)
......@@ -145,4 +144,4 @@ namespace duneuro
}
};
}
#endif // DUNEURO_CONFORMING_TRANSFER_MATRIX_SOLVER_HH
#endif // DUNEURO_FITTED_TRANSFER_MATRIX_SOLVER_HH
#ifndef DUNEURO_CONFORMING_TRANSFER_MATRIX_USER_HH
#define DUNEURO_CONFORMING_TRANSFER_MATRIX_USER_HH
#ifndef DUNEURO_FITTED_TRANSFER_MATRIX_USER_HH
#define DUNEURO_FITTED_TRANSFER_MATRIX_USER_HH
#include <dune/common/parametertree.hh>
#include <dune/common/timer.hh>
......@@ -17,7 +17,7 @@
namespace duneuro
{
template <class S>
struct ConformingTransferMatrixUserTraits {
struct FittedTransferMatrixUserTraits {
static const unsigned int dimension = S::Traits::dimension;
using VolumeConductor = typename S::Traits::VolumeConductor;
using EEGForwardSolver = S;
......@@ -32,12 +32,12 @@ namespace duneuro
};
template <class S, class SMF>
class ConformingTransferMatrixUser
class FittedTransferMatrixUser
{
public:
using Traits = ConformingTransferMatrixUserTraits<S>;
using Traits = FittedTransferMatrixUserTraits<S>;
ConformingTransferMatrixUser(std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
FittedTransferMatrixUser(std::shared_ptr<typename Traits::VolumeConductor> volumeConductor,
std::shared_ptr<typename Traits::ElementSearch> search,
std::shared_ptr<typename Traits::EEGForwardSolver> solver)
: volumeConductor_(volumeConductor), search_(search), solver_(solver)
......@@ -169,4 +169,4 @@ namespace duneuro
};
}
#endif // DUNEURO_CONFORMING_TRANSFER_MATRIX_USER_HH
#endif // DUNEURO_FITTED_TRANSFER_MATRIX_USER_HH
......@@ -24,16 +24,16 @@
#include <duneuro/common/volume_conductor_statistics.hh>
#include <duneuro/common/volume_conductor_storage.hh>
#include <duneuro/eeg/cg_source_model_factory.hh>
#include <duneuro/eeg/conforming_eeg_forward_solver.hh>
#include <duneuro/eeg/conforming_transfer_matrix_solver.hh>
#include <duneuro/eeg/conforming_transfer_matrix_user.hh>
#include <duneuro/eeg/dg_source_model_factory.hh>
#include <duneuro/eeg/electrode_projection_factory.hh>
#include <duneuro/eeg/fitted_eeg_forward_solver.hh>
#include <duneuro/eeg/fitted_transfer_matrix_solver.hh>
#include <duneuro/eeg/fitted_transfer_matrix_user.hh>
#include <duneuro/io/fitted_tensor_vtk_functor.hh>
#include <duneuro/io/volume_conductor_reader.hh>
#include <duneuro/io/vtk_writer.hh>
#include <duneuro/meeg/meeg_driver_interface.hh>
#include <duneuro/meg/conforming_meg_transfer_matrix_solver.hh>
#include <duneuro/meg/fitted_meg_transfer_matrix_solver.hh>
#include <duneuro/meg/meg_solver_factory.hh>
#include <duneuro/meg/meg_solver_interface.hh>
......@@ -321,8 +321,8 @@ namespace duneuro
{
std::vector<std::vector<double>> result(dipoles.size());
using User = ConformingTransferMatrixUser<typename Traits::Solver,
typename Traits::SourceModelFactory>;
using User =
FittedTransferMatrixUser<typename Traits::Solver, typename Traits::SourceModelFactory>;
#if HAVE_TBB
tbb::task_scheduler_init init(config.hasKey("numberOfThreads") ?
......@@ -371,8 +371,8 @@ namespace duneuro
{
std::vector<std::vector<double>> result(dipoles.size());
using User = ConformingTransferMatrixUser<typename Traits::Solver,
typename Traits::SourceModelFactory>;
using User =
FittedTransferMatrixUser<typename Traits::Solver, typename Traits::SourceModelFactory>;
#if HAVE_TBB
tbb::task_scheduler_init init(config.hasKey("numberOfThreads") ?
......@@ -433,9 +433,9 @@ namespace duneuro
#else
typename Traits::SolverBackend solverBackend_;
#endif
ConformingTransferMatrixSolver<typename Traits::Solver> eegTransferMatrixSolver_;
ConformingMEGTransferMatrixSolver<typename Traits::Solver> megTransferMatrixSolver_;
ConformingEEGForwardSolver<typename Traits::Solver, typename Traits::SourceModelFactory>
FittedTransferMatrixSolver<typename Traits::Solver> eegTransferMatrixSolver_;
FittedMEGTransferMatrixSolver<typename Traits::Solver> megTransferMatrixSolver_;
FittedEEGForwardSolver<typename Traits::Solver, typename Traits::SourceModelFactory>
eegForwardSolver_;
std::unique_ptr<duneuro::ElectrodeProjectionInterface<typename Traits::VC::GridView>>
electrodeProjection_;
......
#ifndef DUNEURO_CONFORMING_MEG_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_CONFORMING_MEG_TRANSFER_MATRIX_SOLVER_HH
#ifndef DUNEURO_FITTED_MEG_TRANSFER_MATRIX_SOLVER_HH
#define DUNEURO_FITTED_MEG_TRANSFER_MATRIX_SOLVER_HH
#include <dune/common/parametertree.hh>
#include <dune/common/timer.hh>
......@@ -13,7 +13,7 @@
namespace duneuro
{
template <class S>
struct ConformingMEGTransferMatrixSolverTraits {
struct FittedMEGTransferMatrixSolverTraits {
using Solver = S;
static const unsigned int dimension = S::Traits::dimension;
using VolumeConductor = typename S::Traits::VolumeConductor;
......@@ -27,12 +27,12 @@ namespace duneuro
};
template <class S>
class ConformingMEGTransferMatrixSolver
class FittedMEGTransferMatrixSolver
{
public:
using Traits = ConformingMEGTransferMatrixSolverTraits<S>;
using Traits = FittedMEGTransferMatrixSolverTraits<S>;
ConformingMEGTransferMatrixSolver(std::shared_ptr<typename Traits::Solver> solver,
FittedMEGTransferMatrixSolver(std::shared_ptr<typename Traits::Solver> solver,
std::shared_ptr<typename Traits::MEGSolver> megSolver)
: solver_(solver)
, megSolver_(megSolver)
......@@ -155,4 +155,4 @@ namespace duneuro
}
};
}
#endif // DUNEURO_CONFORMING_MEG_TRANSFER_MATRIX_SOLVER_HH
#endif // DUNEURO_FITTED_MEG_TRANSFER_MATRIX_SOLVER_HH
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