From 594f56d352a4be7d4e7415c6307789a587ecd0fa Mon Sep 17 00:00:00 2001
From: mkirsz <s1351949@sms.ed.ac.uk>
Date: Tue, 5 Mar 2024 15:06:22 +0000
Subject: [PATCH] Fixing static lib

---
 .../basis_functions/dm_bf_linear.cpp          |  4 ++--
 .../basis_functions/dm_bf_polynomial2.cpp     |  4 ++--
 design_matrix/functions/dm_f_all.cpp          | 22 +++++++++++++++++++
 design_matrix/functions/dm_f_all.h            |  2 ++
 design_matrix/functions/dm_function_base.h    |  4 ++--
 design_matrix/functions/kernels/dm_kern_all.h |  2 +-
 .../functions/kernels/dm_kern_linear.cpp      |  4 ++--
 .../functions/kernels/dm_kern_lq.cpp          |  4 ++--
 .../functions/kernels/dm_kern_polynomial.cpp  |  4 ++--
 .../functions/kernels/dm_kern_quadratic.cpp   |  4 ++--
 .../functions/kernels/dm_kern_rbf.cpp         |  4 ++--
 .../functions/kernels/dm_kern_sigmoid.cpp     |  4 ++--
 models/m_all.cpp                              |  6 ++---
 13 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 design_matrix/functions/dm_f_all.cpp
 create mode 100644 design_matrix/functions/dm_f_all.h

diff --git a/design_matrix/functions/basis_functions/dm_bf_linear.cpp b/design_matrix/functions/basis_functions/dm_bf_linear.cpp
index 3c80e23..8b3241a 100644
--- a/design_matrix/functions/basis_functions/dm_bf_linear.cpp
+++ b/design_matrix/functions/basis_functions/dm_bf_linear.cpp
@@ -1,7 +1,7 @@
 #include "dm_bf_linear.h"
 
-Registry<DM_Function_Base>::Register<DM_BF_Linear> DM_BF_Linear_1( "BF_Linear" );
-Registry<DM_Function_Base,Config&>::Register<DM_BF_Linear> DM_BF_Linear_2( "BF_Linear" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_BF_Linear> DM_BF_Linear_1( "BF_Linear" );
+//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): BF_Linear(c)
diff --git a/design_matrix/functions/basis_functions/dm_bf_polynomial2.cpp b/design_matrix/functions/basis_functions/dm_bf_polynomial2.cpp
index 49b1a37..9543e92 100644
--- a/design_matrix/functions/basis_functions/dm_bf_polynomial2.cpp
+++ b/design_matrix/functions/basis_functions/dm_bf_polynomial2.cpp
@@ -1,7 +1,7 @@
 #include "dm_bf_polynomial2.h"
 
-Registry<DM_Function_Base>::Register<DM_BF_Polynomial2> DM_BF_Polynomial2_1( "BF_Polynomial2" );
-Registry<DM_Function_Base,Config&>::Register<DM_BF_Polynomial2> DM_BF_Polynomial2_2( "BF_Polynomial2" );
+//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): BF_Polynomial2(c)
diff --git a/design_matrix/functions/dm_f_all.cpp b/design_matrix/functions/dm_f_all.cpp
new file mode 100644
index 0000000..5d174a0
--- /dev/null
+++ b/design_matrix/functions/dm_f_all.cpp
@@ -0,0 +1,22 @@
+#include "dm_f_all.h"
+
+template<> CONFIG::Registry<DM_Function_Base>::Map CONFIG::Registry<DM_Function_Base>::registry{};
+template<> CONFIG::Registry<DM_Function_Base,Config&>::Map CONFIG::Registry<DM_Function_Base,Config&>::registry{};
+
+
+CONFIG::Registry<DM_Function_Base>::Register<DM_BF_Linear> DM_BF_Linear_1( "BF_Linear" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_BF_Linear> DM_BF_Linear_2( "BF_Linear" );
+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" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Linear> DM_Kern_Linear_1( "Kern_Linear" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Linear> DM_Kern_Linear_2( "Kern_Linear" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_LQ> DM_Kern_LQ_1( "Kern_LQ" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_LQ> DM_Kern_LQ_2( "Kern_LQ" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_1( "Kern_Polynomial" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_2( "Kern_Polynomial" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_1( "Kern_Quadratic" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_2( "Kern_Quadratic" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_RBF> DM_Kern_RBF_1( "Kern_RBF" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_RBF> DM_Kern_RBF_2( "Kern_RBF" );
+CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_1( "Kern_Sigmoid" );
+CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_2( "Kern_Sigmoid" );
diff --git a/design_matrix/functions/dm_f_all.h b/design_matrix/functions/dm_f_all.h
new file mode 100644
index 0000000..38a3183
--- /dev/null
+++ b/design_matrix/functions/dm_f_all.h
@@ -0,0 +1,2 @@
+#include "basis_functions/dm_bf_all.h"
+#include "kernels/dm_kern_all.h"
diff --git a/design_matrix/functions/dm_function_base.h b/design_matrix/functions/dm_function_base.h
index a426f19..1838f86 100644
--- a/design_matrix/functions/dm_function_base.h
+++ b/design_matrix/functions/dm_function_base.h
@@ -27,6 +27,6 @@ struct DM_Function_Base: public virtual Function_Base {
     virtual void calc_phi_stress_rows(phi_type &, size_t &,
             const double[6], const Structure &, const StDescriptors &)=0;
 };
-template<> inline Registry<DM_Function_Base>::Map Registry<DM_Function_Base>::registry{};
-template<> inline Registry<DM_Function_Base,Config&>::Map Registry<DM_Function_Base,Config&>::registry{};
+//template<> inline CONFIG::Registry<DM_Function_Base>::Map CONFIG::Registry<DM_Function_Base>::registry{};
+//template<> inline CONFIG::Registry<DM_Function_Base,Config&>::Map CONFIG::Registry<DM_Function_Base,Config&>::registry{};
 #endif
diff --git a/design_matrix/functions/kernels/dm_kern_all.h b/design_matrix/functions/kernels/dm_kern_all.h
index 5b4c94e..0f050e6 100644
--- a/design_matrix/functions/kernels/dm_kern_all.h
+++ b/design_matrix/functions/kernels/dm_kern_all.h
@@ -1,7 +1,7 @@
 #include "dm_kern_base.h"
 #include "dm_kern_linear.h"
 #include "dm_kern_rbf.h"
-//#include "dm_kern_lq.h"
+#include "dm_kern_lq.h"
 #include "dm_kern_polynomial.h"
 #include "dm_kern_sigmoid.h"
 #include "dm_kern_quadratic.h"
diff --git a/design_matrix/functions/kernels/dm_kern_linear.cpp b/design_matrix/functions/kernels/dm_kern_linear.cpp
index 19d1d09..28fa629 100644
--- a/design_matrix/functions/kernels/dm_kern_linear.cpp
+++ b/design_matrix/functions/kernels/dm_kern_linear.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_linear.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_Linear> DM_Kern_Linear_1( "Kern_Linear" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_Linear> DM_Kern_Linear_2( "Kern_Linear" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Linear> DM_Kern_Linear_1( "Kern_Linear" );
+//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): Kern_Linear(c)
diff --git a/design_matrix/functions/kernels/dm_kern_lq.cpp b/design_matrix/functions/kernels/dm_kern_lq.cpp
index 7fe9251..590406c 100644
--- a/design_matrix/functions/kernels/dm_kern_lq.cpp
+++ b/design_matrix/functions/kernels/dm_kern_lq.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_lq.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_LQ> DM_Kern_LQ_1( "Kern_LQ" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_LQ> DM_Kern_LQ_2( "Kern_LQ" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_LQ> DM_Kern_LQ_1( "Kern_LQ" );
+//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_LQ> DM_Kern_LQ_2( "Kern_LQ" );
 
 DM_Kern_LQ::DM_Kern_LQ():
     Kern_LQ()
diff --git a/design_matrix/functions/kernels/dm_kern_polynomial.cpp b/design_matrix/functions/kernels/dm_kern_polynomial.cpp
index 496292c..b533b00 100644
--- a/design_matrix/functions/kernels/dm_kern_polynomial.cpp
+++ b/design_matrix/functions/kernels/dm_kern_polynomial.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_polynomial.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_1( "Kern_Polynomial" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_2( "Kern_Polynomial" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_1( "Kern_Polynomial" );
+//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Polynomial> DM_Kern_Polynomial_2( "Kern_Polynomial" );
 
 DM_Kern_Polynomial::DM_Kern_Polynomial():
     Kern_Polynomial()
diff --git a/design_matrix/functions/kernels/dm_kern_quadratic.cpp b/design_matrix/functions/kernels/dm_kern_quadratic.cpp
index 0187056..f710de2 100644
--- a/design_matrix/functions/kernels/dm_kern_quadratic.cpp
+++ b/design_matrix/functions/kernels/dm_kern_quadratic.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_quadratic.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_1( "Kern_Quadratic" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_2( "Kern_Quadratic" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_1( "Kern_Quadratic" );
+//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Quadratic> DM_Kern_Quadratic_2( "Kern_Quadratic" );
 
 DM_Kern_Quadratic::DM_Kern_Quadratic():
     Kern_Quadratic()
diff --git a/design_matrix/functions/kernels/dm_kern_rbf.cpp b/design_matrix/functions/kernels/dm_kern_rbf.cpp
index ca41365..2a2112a 100644
--- a/design_matrix/functions/kernels/dm_kern_rbf.cpp
+++ b/design_matrix/functions/kernels/dm_kern_rbf.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_rbf.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_RBF> DM_Kern_RBF_1( "Kern_RBF" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_RBF> DM_Kern_RBF_2( "Kern_RBF" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_RBF> DM_Kern_RBF_1( "Kern_RBF" );
+//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_RBF> DM_Kern_RBF_2( "Kern_RBF" );
 
 DM_Kern_RBF::DM_Kern_RBF():
     Kern_RBF()
diff --git a/design_matrix/functions/kernels/dm_kern_sigmoid.cpp b/design_matrix/functions/kernels/dm_kern_sigmoid.cpp
index 1560b8a..bf84723 100644
--- a/design_matrix/functions/kernels/dm_kern_sigmoid.cpp
+++ b/design_matrix/functions/kernels/dm_kern_sigmoid.cpp
@@ -1,7 +1,7 @@
 #include "dm_kern_sigmoid.h"
 
-Registry<DM_Function_Base>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_1( "Kern_Sigmoid" );
-Registry<DM_Function_Base,Config&>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_2( "Kern_Sigmoid" );
+//CONFIG::Registry<DM_Function_Base>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_1( "Kern_Sigmoid" );
+//CONFIG::Registry<DM_Function_Base,Config&>::Register<DM_Kern_Sigmoid> DM_Kern_Sigmoid_2( "Kern_Sigmoid" );
 
 DM_Kern_Sigmoid::DM_Kern_Sigmoid():
     Kern_Sigmoid()
diff --git a/models/m_all.cpp b/models/m_all.cpp
index 5bc0f46..6d50651 100644
--- a/models/m_all.cpp
+++ b/models/m_all.cpp
@@ -1,5 +1,5 @@
 #include "m_all.h"
 
-template<> Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Map Registry<M_Tadah_Base,DM_Function_Base&,Config&>::registry{};
-Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Register<M_KRR<>> M_KRR_1("M_KRR");
-Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Register<M_BLR<>> M_BLR_1("M_BLR");
+template<> CONFIG::Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Map CONFIG::Registry<M_Tadah_Base,DM_Function_Base&,Config&>::registry{};
+CONFIG::Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Register<M_KRR<>> M_KRR_1("M_KRR");
+CONFIG::Registry<M_Tadah_Base,DM_Function_Base&,Config&>::Register<M_BLR<>> M_BLR_1("M_BLR");
-- 
GitLab