Skip to content
Snippets Groups Projects
Commit cb47d330 authored by mkirsz's avatar mkirsz
Browse files

Proper init of FB

parent 520c2a85
No related branches found
No related tags found
1 merge request!17Fix bug when reading stress with vaspreader. Added T to structure and adjusted...
......@@ -2,5 +2,8 @@
#include "tadah/models/functions/basis_functions/bf_base.h"
#include <tadah/mlip/design_matrix/functions/basis_functions/dm_bf_base.h>
DM_BF_Base::DM_BF_Base() {}
DM_BF_Base::DM_BF_Base(const Config &c): BF_Base(c), DM_Function_Base(c) {}
DM_BF_Base::DM_BF_Base(const Config &c):
Function_Base(c),
BF_Base(c),
DM_Function_Base(c) {}
DM_BF_Base::~DM_BF_Base() {}
......@@ -4,7 +4,10 @@
//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_BF_Linear> DM_BF_Linear_2( "BF_Linear" );
DM_BF_Linear::DM_BF_Linear() {}
DM_BF_Linear::DM_BF_Linear(const Config &c): DM_BF_Base(c), BF_Linear(c)
DM_BF_Linear::DM_BF_Linear(const Config &c):
Function_Base(c),
DM_BF_Base(c),
BF_Linear(c)
{}
size_t DM_BF_Linear::get_phi_cols(const Config &config)
{
......
......
#include "tadah/mlip/design_matrix/functions/kernels/dm_kern_base.h"
#include "tadah/models/functions/function_base.h"
#include <tadah/mlip/design_matrix/functions/basis_functions/dm_bf_polynomial2.h>
//CONFIG::Registry<DM_Function_Base>::Register<DM_BF_Polynomial2> DM_BF_Polynomial2_1( "BF_Polynomial2" );
//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_BF_Polynomial2> DM_BF_Polynomial2_2( "BF_Polynomial2" );
DM_BF_Polynomial2::DM_BF_Polynomial2() {}
DM_BF_Polynomial2::DM_BF_Polynomial2(const Config &c): DM_BF_Base(c), BF_Polynomial2(c)
DM_BF_Polynomial2::DM_BF_Polynomial2(const Config &c):
Function_Base(c),
DM_BF_Base(c),
BF_Polynomial2(c)
{}
size_t DM_BF_Polynomial2::get_phi_cols(const Config &config)
{
......
......
......@@ -5,7 +5,10 @@
DM_Kern_Base::~DM_Kern_Base() {}
DM_Kern_Base::DM_Kern_Base() {}
DM_Kern_Base::DM_Kern_Base(const Config &c): Kern_Base(c), DM_Function_Base(c) {}
DM_Kern_Base::DM_Kern_Base(const Config &c):
Function_Base(c),
Kern_Base(c),
DM_Function_Base(c) {}
size_t DM_Kern_Base::get_phi_cols(const Config &)
{
return basis.cols();
......
......
......@@ -5,7 +5,10 @@
//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Linear> DM_Kern_Linear_2( "Kern_Linear" );
DM_Kern_Linear::DM_Kern_Linear() {}
DM_Kern_Linear::DM_Kern_Linear (const Config &c): DM_Kern_Base(c), Kern_Linear(c)
DM_Kern_Linear::DM_Kern_Linear (const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_Linear(c)
{}
size_t DM_Kern_Linear::get_phi_cols(const Config &config)
{
......
......
#include "tadah/mlip/design_matrix/functions/kernels/dm_kern_base.h"
#include "tadah/models/functions/function_base.h"
#include <tadah/mlip/design_matrix/functions/kernels/dm_kern_lq.h>
//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_LQ> DM_Kern_LQ_1( "Kern_LQ" );
......@@ -7,6 +8,7 @@
DM_Kern_LQ::DM_Kern_LQ()
{}
DM_Kern_LQ::DM_Kern_LQ(const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_LQ(c)
{}
......@@ -6,6 +6,7 @@
DM_Kern_Polynomial::DM_Kern_Polynomial()
{}
DM_Kern_Polynomial::DM_Kern_Polynomial(const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_Polynomial(c)
{}
#include "tadah/models/functions/function_base.h"
#include <tadah/mlip/design_matrix/functions/kernels/dm_kern_quadratic.h>
//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_1( "Kern_Quadratic" );
......@@ -6,6 +7,7 @@
DM_Kern_Quadratic::DM_Kern_Quadratic()
{}
DM_Kern_Quadratic::DM_Kern_Quadratic(const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_Quadratic(c)
{}
......@@ -6,6 +6,7 @@
DM_Kern_RBF::DM_Kern_RBF()
{}
DM_Kern_RBF::DM_Kern_RBF(const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_RBF(c)
{}
......@@ -6,6 +6,7 @@
DM_Kern_Sigmoid::DM_Kern_Sigmoid()
{}
DM_Kern_Sigmoid::DM_Kern_Sigmoid(const Config &c):
Function_Base(c),
DM_Kern_Base(c),
Kern_Sigmoid(c)
{}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment