mirror of
https://github.com/Relintai/pmlpp.git
synced 2025-04-27 17:14:58 +02:00
Use the new MLPPReg::RegularizationType instead of a String in MLPPHiddenLayer.
This commit is contained in:
parent
bda7a7aee4
commit
bbe334856b
@ -27,7 +27,7 @@ void MLPPHiddenLayer::test(const Ref<MLPPVector> &x) {
|
|||||||
a_test = avn.run_activation_norm_matrix(activation, z_test);
|
a_test = avn.run_activation_norm_matrix(activation, z_test);
|
||||||
}
|
}
|
||||||
|
|
||||||
MLPPHiddenLayer::MLPPHiddenLayer(int p_n_hidden, MLPPActivation::ActivationFunction p_activation, Ref<MLPPMatrix> p_input, MLPPUtilities::WeightDistributionType p_weight_init, String p_reg, real_t p_lambda, real_t p_alpha) {
|
MLPPHiddenLayer::MLPPHiddenLayer(int p_n_hidden, MLPPActivation::ActivationFunction p_activation, Ref<MLPPMatrix> p_input, MLPPUtilities::WeightDistributionType p_weight_init, MLPPReg::RegularizationType p_reg, real_t p_lambda, real_t p_alpha) {
|
||||||
n_hidden = p_n_hidden;
|
n_hidden = p_n_hidden;
|
||||||
activation = p_activation;
|
activation = p_activation;
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "../activation/activation.h"
|
#include "../activation/activation.h"
|
||||||
#include "../utilities/utilities.h"
|
#include "../utilities/utilities.h"
|
||||||
|
#include "../regularization/reg.h"
|
||||||
|
|
||||||
#include "../lin_alg/mlpp_matrix.h"
|
#include "../lin_alg/mlpp_matrix.h"
|
||||||
#include "../lin_alg/mlpp_vector.h"
|
#include "../lin_alg/mlpp_vector.h"
|
||||||
@ -45,7 +46,7 @@ public:
|
|||||||
Ref<MLPPMatrix> delta;
|
Ref<MLPPMatrix> delta;
|
||||||
|
|
||||||
// Regularization Params
|
// Regularization Params
|
||||||
String reg;
|
MLPPReg::RegularizationType reg;
|
||||||
real_t lambda; /* Regularization Parameter */
|
real_t lambda; /* Regularization Parameter */
|
||||||
real_t alpha; /* This is the controlling param for Elastic Net*/
|
real_t alpha; /* This is the controlling param for Elastic Net*/
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ public:
|
|||||||
void forward_pass();
|
void forward_pass();
|
||||||
void test(const Ref<MLPPVector> &x);
|
void test(const Ref<MLPPVector> &x);
|
||||||
|
|
||||||
MLPPHiddenLayer(int p_n_hidden, MLPPActivation::ActivationFunction p_activation, Ref<MLPPMatrix> p_input, MLPPUtilities::WeightDistributionType p_weight_init, String p_reg, real_t p_lambda, real_t p_alpha);
|
MLPPHiddenLayer(int p_n_hidden, MLPPActivation::ActivationFunction p_activation, Ref<MLPPMatrix> p_input, MLPPUtilities::WeightDistributionType p_weight_init, MLPPReg::RegularizationType p_reg, real_t p_lambda, real_t p_alpha);
|
||||||
|
|
||||||
MLPPHiddenLayer();
|
MLPPHiddenLayer();
|
||||||
~MLPPHiddenLayer();
|
~MLPPHiddenLayer();
|
||||||
|
Loading…
Reference in New Issue
Block a user