From bc47c4d42bb9bb5f78f4abe6cccce3a7eaf912f6 Mon Sep 17 00:00:00 2001 From: Jakhes <dean.schmitz@schmitzbauer.de> Date: Tue, 11 Oct 2022 19:32:27 +0200 Subject: [PATCH] Removing CF --- Makefile | 7 ++--- src/methods/cf/Makefile | 8 ------ src/methods/cf/cf.cpp | 41 ---------------------------- src/methods/cf/cf.pl | 48 --------------------------------- src/methods/cf/cf_test.pl | 56 --------------------------------------- 5 files changed, 2 insertions(+), 158 deletions(-) delete mode 100644 src/methods/cf/Makefile delete mode 100644 src/methods/cf/cf.cpp delete mode 100644 src/methods/cf/cf.pl delete mode 100644 src/methods/cf/cf_test.pl diff --git a/Makefile b/Makefile index ff4f08b..1c4c9a6 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,11 @@ SPLFR_PATH=/usr/local/sicstus4.7.1/bin/splfr all: @echo "Start compiling!" @echo "AdaBoost!..." - make -C src/methods/ada_boost splfr=$(SPLFR_PATH) + make -C src/methods/adaboost splfr=$(SPLFR_PATH) @echo "ApproxKFN!..." make -C src/methods/approx_kfn splfr=$(SPLFR_PATH) @echo "BayesianLinearRegression!..." make -C src/methods/bayesian_linear_regression splfr=$(SPLFR_PATH) - @echo "CF!..." - #make -C src/methods/cf splfr=$(SPLFR_PATH) @echo "DBScan!..." make -C src/methods/dbscan splfr=$(SPLFR_PATH) @echo "DecisionTree!..." @@ -67,10 +65,9 @@ all: make -C src/methods/sparse_coding splfr=$(SPLFR_PATH) clean: - make -C src/methods/ada_boost clean + make -C src/methods/adaboost clean make -C src/methods/approx_kfn clean make -C src/methods/bayesian_linear_regression clean - #make -C src/methods/cf clean make -C src/methods/dbscan clean make -C src/methods/decision_tree clean make -C src/methods/emst clean diff --git a/src/methods/cf/Makefile b/src/methods/cf/Makefile deleted file mode 100644 index e2b0457..0000000 --- a/src/methods/cf/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -splfr=/usr/local/sicstus4.7.1/bin/splfr - -METHOD_NAME=cf - -$(METHOD_NAME).so: $(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 diff --git a/src/methods/cf/cf.cpp b/src/methods/cf/cf.cpp deleted file mode 100644 index 7475dc0..0000000 --- a/src/methods/cf/cf.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include <sicstus/sicstus.h> -/* ex_glue.h is generated by splfr from the foreign/[2,3] facts. - Always include the glue header in your foreign resource code. -*/ -#include "cf_glue.h" -#include <mlpack/methods/cf/cf_model.hpp> -#include <mlpack/core.hpp> - -// including helper functions for converting between arma structures and arrays -#include "../../helper_files/helper.hpp" - -// some of the most used namespaces -using namespace arma; -using namespace mlpack; -using namespace std; -using namespace mlpack::cf; - -// Global Variable of the GlobalMethodObject object so it can be accessed from all functions -GlobalMethodObject globalMethodObject; - - -// TODO: -// input: -// output: -// description: -void sampleFunction() -{ - //stuff; -} - -// Basic input parameters -// -// SP_integer integerNumber, double doubleNumber, char const *string -// -// Snippets -// -// Take Matrix: mat-take, take-mat -// Take Array: arr-take, take-arr -// -// Return Matrix: mat-return, return-mat -// Return Array: arr-return, return-arr diff --git a/src/methods/cf/cf.pl b/src/methods/cf/cf.pl deleted file mode 100644 index 43f90c4..0000000 --- a/src/methods/cf/cf.pl +++ /dev/null @@ -1,48 +0,0 @@ -:- module(new_method, [function/1]). - -%% requirements of library(struct) -:- load_files(library(str_decl), - [when(compile_time), if(changed)]). - -%% needed for using the array type -:- use_module(library(structs)). -:- use_module('../../helper_files/helper.pl'). - -%% type definitions for the float array -:- foreign_type - float32 = float_32, - float_array = array(float32). - -%% definitions for the connected function - -%% TODO: -%% --Input-- -%% -%% --Output-- -%% -%% --Description-- -foreign(function, c, function(arguments)). - - - -%% +integer , +float32, +string -%% [-integer] , [-float32], [-string] - -%% matrix input -%% +pointer(float_array), +integer, +integer - -%% array input -%% +pointer(float_array), +integer - -%% matrix return -%% -pointer(float_array), -integer, -integer - -%% array return -%% -pointer(float_array), -integer - -%% bool name => (1)true / (0)false - -%% Defines the functions that get connected from main.cpp -foreign_resource(new_method, [function]). - -:- load_foreign_resource(new_method). \ No newline at end of file diff --git a/src/methods/cf/cf_test.pl b/src/methods/cf/cf_test.pl deleted file mode 100644 index 6df320a..0000000 --- a/src/methods/cf/cf_test.pl +++ /dev/null @@ -1,56 +0,0 @@ -:- use_module(library(plunit)). - -:- use_module(cf). -:- use_module('../../helper_files/helper.pl'). - -reset_Model :- - initModel(1,0,50,0.0001). - -:- begin_tests(lists). - -%% alpha tests -test(alpha_std_init) :- - reset_Model, - alpha(0). -test(alpha_wrong_input, fail) :- - reset_Model, - alpha(1). -test(alpha_after_train, A =:= 9223372036854775808) :- - reset_Model, - convert_list_to_float_array([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5],3, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize), - alpha(A). - -%% train tests -test(correct_train) :- - reset_Model, - convert_list_to_float_array([5.1,3.5,1.4,4.9,3.0,1.4,4.7,3.2,1.3,4.6,3.1,1.5],3, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -test(false_train, fail) :- - reset_Model, - convert_list_to_float_array([],3, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -test(false_train2, fail) :- - reset_Model, - convert_list_to_float_array([],0, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -test(false_train3, fail) :- - reset_Model, - convert_list_to_float_array([1,2],0, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -test(false_train3, fail) :- - reset_Model, - convert_list_to_float_array([1,2,44,3],3, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -test(false_train4) :- - reset_Model, - convert_list_to_float_array([1,2,44,3],2, array(Xsize, Xrownum, X)), - convert_list_to_float_array([0.2,0.2,0.2,0.2], array(Ysize, Y)), - train(X,Xsize, Xrownum,Y, Ysize). -:- end_tests(lists). \ No newline at end of file -- GitLab