From f1748ec8404873e834bc774d92f09c2d4ff2de02 Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Tue, 17 Dec 2024 13:50:12 +0000
Subject: [PATCH] Proper init of FB

---
 src/bf_linear.cpp       | 4 +++-
 src/bf_polynomial2.cpp  | 4 +++-
 src/function_base.cpp   | 8 ++++----
 src/kern_linear.cpp     | 1 +
 src/kern_lq.cpp         | 1 +
 src/kern_polynomial.cpp | 1 +
 src/kern_quadratic.cpp  | 1 +
 src/kern_rbf.cpp        | 1 +
 src/kern_sigmoid.cpp    | 1 +
 9 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/bf_linear.cpp b/src/bf_linear.cpp
index b9e73ce..7f9fb1a 100644
--- a/src/bf_linear.cpp
+++ b/src/bf_linear.cpp
@@ -1,7 +1,9 @@
 #include <tadah/models/functions/basis_functions/bf_linear.h>
 
 BF_Linear::BF_Linear() {}
-BF_Linear::BF_Linear(const Config &c): BF_Base(c) {}
+BF_Linear::BF_Linear(const Config &c):
+  Function_Base(c),
+  BF_Base(c) {}
 std::string BF_Linear::get_label() const {
     return label;
 }
diff --git a/src/bf_polynomial2.cpp b/src/bf_polynomial2.cpp
index 387e3f1..8b99fb3 100644
--- a/src/bf_polynomial2.cpp
+++ b/src/bf_polynomial2.cpp
@@ -1,7 +1,9 @@
 #include <tadah/models/functions/basis_functions/bf_polynomial2.h>
 
 BF_Polynomial2::BF_Polynomial2() {}
-BF_Polynomial2::BF_Polynomial2(const Config &c): BF_Base(c)
+BF_Polynomial2::BF_Polynomial2(const Config &c): 
+  Function_Base(c),
+  BF_Base(c)
 {}
 std::string BF_Polynomial2::get_label() const
 {
diff --git a/src/function_base.cpp b/src/function_base.cpp
index 748af71..1e62fad 100644
--- a/src/function_base.cpp
+++ b/src/function_base.cpp
@@ -8,10 +8,10 @@ Function_Base::Function_Base(const Config &c) {
 void Function_Base::set_verbose(int v) { verbose=v; }
 int Function_Base::get_verbose() { return verbose; }
 
-Function_Base::~Function_Base() {};
+Function_Base::~Function_Base() {}
 
-double Function_Base::operator() (const aed_type2& , const aed_type2& ) const {std::cout << "FB" <<std::endl; return 0.0; };
-aed_type2 Function_Base::derivative(const aed_type2& , const aed_type2& ) const { return aed_type2(); };
+double Function_Base::operator() (const aed_type2& , const aed_type2& ) const { return 0.0; }
+aed_type2 Function_Base::derivative(const aed_type2& , const aed_type2& ) const { return aed_type2(); }
 double Function_Base::prime(const aed_type2& , const aed_type2& ,
                             const aed_type2& ) const { return 0.0; }
-void Function_Base::set_basis(const Matrix ) {};
+void Function_Base::set_basis(const Matrix ) {}
diff --git a/src/kern_linear.cpp b/src/kern_linear.cpp
index ef72038..b30cd88 100644
--- a/src/kern_linear.cpp
+++ b/src/kern_linear.cpp
@@ -2,6 +2,7 @@
 
 Kern_Linear::Kern_Linear() {}
 Kern_Linear::Kern_Linear (const Config &c):
+    Function_Base(c),
     Kern_Base(c)
 {}
 double Kern_Linear::operator() (const aed_type2& b, const aed_type2& af) const
diff --git a/src/kern_lq.cpp b/src/kern_lq.cpp
index 7bb370a..7c51e1e 100644
--- a/src/kern_lq.cpp
+++ b/src/kern_lq.cpp
@@ -2,6 +2,7 @@
 
 Kern_LQ::Kern_LQ () {}
 Kern_LQ::Kern_LQ (const Config &c):
+    Function_Base(c),
     Kern_Base(c)
 {
     if (get_verbose()) std::cout << std::endl << label << std::endl;
diff --git a/src/kern_polynomial.cpp b/src/kern_polynomial.cpp
index 84a615b..77a9911 100644
--- a/src/kern_polynomial.cpp
+++ b/src/kern_polynomial.cpp
@@ -2,6 +2,7 @@
 
 Kern_Polynomial::Kern_Polynomial () {}
 Kern_Polynomial::Kern_Polynomial (const Config &config):
+    Function_Base(config),
     Kern_Base(config),
     d(config.get<int>("MPARAMS",0)),
     gamma(config.get<double>("MPARAMS",1)),
diff --git a/src/kern_quadratic.cpp b/src/kern_quadratic.cpp
index 3852a96..f22a8c0 100644
--- a/src/kern_quadratic.cpp
+++ b/src/kern_quadratic.cpp
@@ -2,6 +2,7 @@
 
 Kern_Quadratic::Kern_Quadratic () {}
 Kern_Quadratic::Kern_Quadratic (const Config &c):
+    Function_Base(c),
     Kern_Base(c)
 {
     if (get_verbose()) std::cout << std::endl << label << std::endl;
diff --git a/src/kern_rbf.cpp b/src/kern_rbf.cpp
index 9a374ac..e80b5f2 100644
--- a/src/kern_rbf.cpp
+++ b/src/kern_rbf.cpp
@@ -2,6 +2,7 @@
 
 Kern_RBF::Kern_RBF () {}
 Kern_RBF::Kern_RBF (const Config &c):
+    Function_Base(c),
     Kern_Base(c),
     sigma(c.get<double>("MPARAMS")),
     gamma(1.0/(2.0*sigma*sigma))
diff --git a/src/kern_sigmoid.cpp b/src/kern_sigmoid.cpp
index 1586030..de31d52 100644
--- a/src/kern_sigmoid.cpp
+++ b/src/kern_sigmoid.cpp
@@ -2,6 +2,7 @@
 
 Kern_Sigmoid::Kern_Sigmoid () {}
 Kern_Sigmoid::Kern_Sigmoid (const Config &config):
+    Function_Base(config),
     Kern_Base(config),
     gamma(config.get<double>("MPARAMS",0)),
     c(config.get<double>("MPARAMS",1))
-- 
GitLab