Extracting the helper funktions into their own helper file

src/helper_files/helper.cpp

+
+#include "helper.hpp"
+
+// Extra functions to reduce some code for the conversion between arma and float *array
+
+float *convertArmaToArray(colvec vec)
+{
+	vector<float> vectorData = conv_to<vector<float>>::from(vec);
+	int vectorSize = vectorData.size();
+
+	// using malloc so the memory is still valid outside of the function
+	float *arr = (float *)malloc (sizeof(float) * vectorSize);
+
+	// save the data in a normal array so it can be send to prolog
+	for(int i = 0; i < vectorSize; i++)
+	{
+		arr[i] = vectorData[i];
+	}
+	return arr;
+}
+float *convertArmaToArray(rowvec vec)
+{
+	colvec newVec = conv_to<colvec>::from(vec);
+	return convertArmaToArray(newVec);
+}
+
+rowvec convertArrayToRowvec(float *arr, int vecSize)
+{
+	rowvec rVector(vecSize);
+	for(int i = 0; i < vecSize; i++)
+	{
+		rVector[i] = arr[i];
+	}
+	return rVector;
+}
+
+mat convertArrayToMat(float *arr, int vecSize, int rowCount)
+{
+	mat matrix(rowCount,(vecSize/rowCount));
+	for(int i = 0; i < vecSize; i++)
+	{
+		matrix[i] = arr[i];
+	}
+	return matrix;
+}

src/helper_files/helper.hpp

+#ifndef HELPER_HEADER
+#define HELPER_HEADER
+
+#include <mlpack/core.hpp>
+
+using namespace arma;
+using namespace mlpack;
+using namespace std;
+
+float *convertArmaToArray(colvec vec);
+
+float *convertArmaToArray(rowvec vec);
+
+rowvec convertArrayToRowvec(float *arr, int vecSize);
+
+mat convertArrayToMat(float *arr, int vecSize, int rowCount);
+
+#endif

src/methods/bayesian_linear_regression/Makefile

@@ -3,6 +3,6 @@ splfr=/usr/local/sicstus4.7.1/bin/splfr
 METHOD_NAME=bayesian_linear_regression
 
 $(METHOD_NAME).so: $(METHOD_NAME).pl $(METHOD_NAME).cpp
-	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp
+	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp ../../helper_files/helper.cpp
 clean:
 	rm $(METHOD_NAME).so
\ No newline at end of file

src/methods/bayesian_linear_regression/bayesian_linear_regression.cpp

@@ -6,6 +6,9 @@
 #include <mlpack/methods/bayesian_linear_regression/bayesian_linear_regression.hpp>
 #include <mlpack/core.hpp>
 
+// including helper functions for converting between arma structures and arrays
+#include "../../helper_files/helper.hpp"
+
 using namespace arma;
 using namespace mlpack;
 using namespace std;
@@ -14,49 +17,6 @@ using namespace mlpack::regression;
 // Global Variable of the BayesianLinearRegression object so it can be accessed from all functions
 BayesianLinearRegression regressor;
 
-// Extra functions to reduce some code for the conversion between arma and float *array
-float *convertArmaToArray(colvec vec)
-{
-	vector<float> vectorData = conv_to<vector<float>>::from(vec);
-	int vectorSize = vectorData.size();
-
-	// using malloc so the memory is still valid outside of the function
-	float *arr = (float *)malloc (sizeof(float) * vectorSize);
-
-	// save the data in a normal array so it can be send to prolog
-	for(int i = 0; i < vectorSize; i++)
-	{
-		arr[i] = vectorData[i];
-	}
-	return arr;
-}
-float *convertArmaToArray(rowvec vec)
-{
-	colvec newVec = conv_to<colvec>::from(vec);
-	return convertArmaToArray(newVec);
-}
-
-rowvec convertArrayToRowvec(float *arr, SP_integer vecSize)
-{
-	rowvec rVector(vecSize);
-	for(int i = 0; i < vecSize; i++)
-	{
-		rVector[i] = arr[i];
-	}
-	return rVector;
-}
-
-mat convertArrayToMat(float *arr, SP_integer vecSize, SP_integer rowCount)
-{
-	mat matrix(rowCount,(vecSize/rowCount));
-	for(int i = 0; i < vecSize; i++)
-	{
-		matrix[i] = arr[i];
-	}
-	return matrix;
-}
-
-
 // input:	const bool , const bool , const size_t , const double
 // output: double
 void initModel(SP_integer centerData, SP_integer scaleData, SP_integer nIterMax, double tol)

src/methods/bayesian_linear_regression/bayesian_linear_regression.pl

-:- module(bayesian_linear_regression, [initModel/4, alpha/1, beta/1, dataOffset/2, dataScale/2, omega/2, predict/5, predictWithStd/7, rmse/6, train/5, variance/1]).
+:- module(bayesian_linear_regression, [initModel/4, alpha/1, beta/1, dataOffset/2, dataScale/2, omega/2, predict/5, predictWithStd/7, rmse/6, train/5, variance/1, predict/2, train/0]).
 
 :- load_files(library(str_decl),
               [when(compile_time), if(changed)]).

src/methods/linear_regression/Makefile

@@ -3,6 +3,6 @@ splfr=/usr/local/sicstus4.7.1/bin/splfr
 METHOD_NAME=linear_regression
 
 $(METHOD_NAME).so: $(METHOD_NAME).pl $(METHOD_NAME).cpp
-	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp
+	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp ../../helper_files/helper.cpp
 clean:
 	rm $(METHOD_NAME).so

src/methods/linear_regression/linear_regression.cpp

@@ -3,9 +3,12 @@
    Always include the glue header in your foreign resource code.
 */
 #include "linear_regression_glue.h"
-#include <mlpack/methods/regression/linear_regression/linear_regression.hpp>
+#include <mlpack/methods/linear_regression/linear_regression.hpp>
 #include <mlpack/core.hpp>
 
+// including helper functions for converting between arma structures and arrays
+#include "../../helper_files/helper.hpp"
+
 using namespace arma;
 using namespace mlpack;
 using namespace std;
@@ -14,49 +17,6 @@ using namespace mlpack::regression;
 // Global Variable of the LinearRegression object so it can be accessed from all functions
 LinearRegression regressor;
 
-// Extra functions to reduce some code for the conversion between arma and float *array
-float *convertArmaToArray(colvec vec)
-{
-	vector<float> vectorData = conv_to<vector<float>>::from(vec);
-	int vectorSize = vectorData.size();
-
-	// using malloc so the memory is still valid outside of the function
-	float *arr = (float *)malloc (sizeof(float) * vectorSize);
-
-	// save the data in a normal array so it can be send to prolog
-	for(int i = 0; i < vectorSize; i++)
-	{
-		arr[i] = vectorData[i];
-	}
-	return arr;
-}
-float *convertArmaToArray(rowvec vec)
-{
-	colvec newVec = conv_to<colvec>::from(vec);
-	return convertArmaToArray(newVec);
-}
-
-rowvec convertArrayToRowvec(float *arr, SP_integer vecSize)
-{
-	rowvec rVector(vecSize);
-	for(int i = 0; i < vecSize; i++)
-	{
-		rVector[i] = arr[i];
-	}
-	return rVector;
-}
-
-mat convertArrayToMat(float *arr, SP_integer vecSize, SP_integer rowCount)
-{
-	mat matrix(rowCount,(vecSize/rowCount));
-	for(int i = 0; i < vecSize; i++)
-	{
-		matrix[i] = arr[i];
-	}
-	return matrix;
-}
-
-
 // input:	const bool , const bool , const size_t , const double
 // output: double
 void initModel(SP_integer centerData, SP_integer scaleData, SP_integer nIterMax, double tol)

src/methods/new_method/Makefile

@@ -3,6 +3,6 @@ splfr=/usr/local/sicstus4.7.1/bin/splfr
 METHOD_NAME=new_method
 
 $(METHOD_NAME).so: $(METHOD_NAME).pl $(METHOD_NAME).cpp
-	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp
+	$(splfr) -larmadillo -fopenmp -lmlpack -lstdc++ -cxx --struct $(METHOD_NAME).pl $(METHOD_NAME).cpp ../../helper_files/helper.cpp
 clean:
 	rm $(METHOD_NAME).so

src/methods/new_method/new_method.cpp

@@ -6,6 +6,9 @@
 #include <mlpack/methods/new_method.hpp>
 #include <mlpack/core.hpp>
 
+// including helper functions for converting between arma structures and arrays
+#include "../../helper_files/helper.hpp"
+
 using namespace arma;
 using namespace mlpack;
 using namespace std;
@@ -14,48 +17,6 @@ using namespace mlpack::regression;
 // Global Variable of the BayesianLinearRegression object so it can be accessed from all functions
 BayesianLinearRegression regressor;
 
-// Extra functions to reduce some code for the conversion between arma and float *array
-float *convertArmaToArray(colvec vec)
-{
-	vector<float> vectorData = conv_to<vector<float>>::from(vec);
-	int vectorSize = vectorData.size();
-
-	// using malloc so the memory is still valid outside of the function
-	float *arr = (float *)malloc (sizeof(float) * vectorSize);
-
-	// save the data in a normal array so it can be send to prolog
-	for(int i = 0; i < vectorSize; i++)
-	{
-		arr[i] = vectorData[i];
-	}
-	return arr;
-}
-float *convertArmaToArray(rowvec vec)
-{
-	colvec newVec = conv_to<colvec>::from(vec);
-	return convertArmaToArray(newVec);
-}
-
-rowvec convertArrayToRowvec(float *arr, SP_integer vecSize)
-{
-	rowvec rVector(vecSize);
-	for(int i = 0; i < vecSize; i++)
-	{
-		rVector[i] = arr[i];
-	}
-	return rVector;
-}
-
-mat convertArrayToMat(float *arr, SP_integer vecSize, SP_integer rowCount)
-{
-	mat matrix(rowCount,(vecSize/rowCount));
-	for(int i = 0; i < vecSize; i++)
-	{
-		matrix[i] = arr[i];
-	}
-	return matrix;
-}
-
 
 // input:	const bool , const bool , const size_t , const double
 // output: double