Commit 6ed485c8 authored by Steffen Schotthöfer's avatar Steffen Schotthöfer
Browse files

Merge branch 'mergebranch_sprint1' of https://git.scc.kit.edu/rtsn/rtsn into mergebranch_sprint1

parents 21743d92 f036ed08
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -34,7 +34,7 @@ class Interpolation
inline double EvalCubic1DSpline( double param[4], double x ) const;
public:
//In constructor tabulated values are initialised
// In constructor tabulated values are initialised
/*!
* @brief constructor linear interpolation for std::vector input
* @param[in] x - table values for x
......@@ -59,7 +59,7 @@ class Interpolation
*/
Interpolation( const Vector& x, const Vector& y, const Matrix& data, TYPE type = cubic );
//Here the interpolation between the previously defined table values is performed
// Here the interpolation between the previously defined table values is performed
/*!
* @brief defines one dimensional interpolation at x
* @param[in] x - value at which to interpolate
......@@ -68,21 +68,21 @@ class Interpolation
double operator()( double x ) const;
/*!
* @brief defines interpolation for a Vector of values
* @brief defines interpolation for a Vector of values
* @param[in] v - values at which to interpolate
* @param[out] y - corresponding interpolated values
*/
Vector operator()( Vector v ) const;
/*!
* @brief defines interpolation for a std::vector of values
* @brief defines interpolation for a std::vector of values
* @param[in] v - values at which to interpolate
* @param[out] y - corresponding interpolated values
*/
std::vector<double> operator()( std::vector<double> v ) const;
/*!
* @brief defines 2D interpolation at x and y
* @brief defines 2D interpolation at x and y
* @param[in] x - value at which to interpolate
* @param[in] y - value at which to interpolate
* @param[out] data - corresponding interpolated value
......
#include "optimizers/optimizerbase.h"
#include "optimizers/mloptimizer.h"
#include "common/config.h"
#include "entropies/entropybase.h"
#include "optimizers/mloptimizer.h"
#include "optimizers/newtonoptimizer.h"
OptimizerBase::OptimizerBase( Config* settings ) {
_entropy = EntropyBase::Create( settings );
_settings = settings;
......
......@@ -5,9 +5,9 @@
#include "problems/electronrt.h"
#include "problems/linesource.h"
#include "problems/musclebonelung.h"
#include "problems/phantom2d.h"
#include "problems/problembase.h"
#include "problems/waterphantom.h"
#include "problems/phantom2d.h"
ProblemBase::ProblemBase( Config* settings, Mesh* mesh ) {
_settings = settings;
......
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