diff --git a/src/methods/decision_tree/decision_tree.pl b/src/methods/decision_tree/decision_tree.pl index 16229538656dbab3222b90db952eb16deef6a8df..6297c123dd095589512720b8e6a25ee4f02eda00 100644 --- a/src/methods/decision_tree/decision_tree.pl +++ b/src/methods/decision_tree/decision_tree.pl @@ -64,9 +64,9 @@ decision_tree_classifyPoint(DataList, Prediction, AssignList) :- classifyPointI(X, Xsize, Prediction, Y, Ysize), convert_float_array_to_list(Y, Ysize, AssignList). -foreign(classifyPoint, c, classifyPointI(+pointer(float_array), +integer, - -integer, - -pointer(float_array), -integer)). +foreign(classifyPoint, c, classifyPointI( +pointer(float_array), +integer, + -integer, + -pointer(float_array), -integer)). %% --Input-- @@ -85,7 +85,7 @@ decision_tree_classifyMatrix(DataList, DataRows, PredictionList, ProbsList, ZCol convert_float_array_to_list(Y, Ysize, PredictionList), convert_float_array_to_2d_list(Z, ZCols, ZRows, ProbsList). -foreign(classifyMatrix, c, classifyMatrixI( +pointer(float_array), +integer, +integer, +foreign(classifyMatrix, c, classifyMatrixI( +pointer(float_array), +integer, +integer, -pointer(float_array), -integer, -pointer(float_array), -integer, -integer)). @@ -115,10 +115,10 @@ decision_tree_train(DataList, DataRows, LabelsList, NumClasses, MinimumLeafSize, convert_list_to_float_array(LabelsList, array(Ysize, Y)), trainI(X, Xsize, Xrownum, Y, Ysize, NumClasses, MinimumLeafSize, MinimumGainSplit, MaximumDepth, Entropy). -foreign(train, c, trainI(+pointer(float_array), +integer, +integer, - +pointer(float_array), +integer, - +integer, +integer, +float32, +integer, - [-float32])). +foreign(train, c, trainI( +pointer(float_array), +integer, +integer, + +pointer(float_array), +integer, + +integer, +integer, +float32, +integer, + [-float32])). %% Defines the functions that get connected from main.cpp diff --git a/src/methods/logistic_regression/logistic_regression.pl b/src/methods/logistic_regression/logistic_regression.pl index d84ea2b47d0070654db4a9775aca91dc06a31c0e..f5fc2fdafe08e3650435940b07e9da5d66d8b907 100644 --- a/src/methods/logistic_regression/logistic_regression.pl +++ b/src/methods/logistic_regression/logistic_regression.pl @@ -58,7 +58,7 @@ foreign(initModelNoOptimizer, c, initModelNoOptimizerI( +pointer(float_array), + %% --Description-- %% Initialize the logistic_regression model and specify the optimizer. %% -logistic_regression_initModelWithOptimizer(DataList, DataRows, ResponsesList, Responses, Lambda, MaxIterations, Tolerance, StepSize, BatchSize) :- +logistic_regression_initModelWithOptimizer(DataList, DataRows, ResponsesList, Optimizer, Lambda, MaxIterations, Tolerance, StepSize, BatchSize) :- Lambda >= 0.0, MaxIterations >= 0, Tolerance >= 0.0, @@ -66,7 +66,7 @@ logistic_regression_initModelWithOptimizer(DataList, DataRows, ResponsesList, Re BatchSize > 0, convert_list_to_float_array(DataList, DataRows, array(Xsize, Xrownum, X)), convert_list_to_float_array(ResponsesList, array(Ysize, Y)), - initModelWithOptimizerI(X, Xsize, Xrownum, Y, Ysize, Responses, Lambda, MaxIterations, Tolerance, StepSize, BatchSize). + initModelWithOptimizerI(X, Xsize, Xrownum, Y, Ysize, Optimizer, Lambda, MaxIterations, Tolerance, StepSize, BatchSize). foreign(initModelWithOptimizer, c, initModelWithOptimizerI( +pointer(float_array), +integer, +integer, +pointer(float_array), +integer,