diff --git a/src/nnue/trainer/features/factorizer.h b/src/nnue/trainer/features/factorizer.h index 15ce8022..b64b0c74 100644 --- a/src/nnue/trainer/features/factorizer.h +++ b/src/nnue/trainer/features/factorizer.h @@ -14,7 +14,7 @@ namespace Eval::NNUE::Features { class Factorizer { public: static constexpr std::string get_name() { - return std::string("No factorizer"); + return "Factorizer<" + FeatureType::get_name() + "> -> " + std::string("No factorizer"); } static constexpr std::string get_factorizers_string() { diff --git a/src/nnue/trainer/features/factorizer_feature_set.h b/src/nnue/trainer/features/factorizer_feature_set.h index f5ee3c5c..60f42166 100644 --- a/src/nnue/trainer/features/factorizer_feature_set.h +++ b/src/nnue/trainer/features/factorizer_feature_set.h @@ -82,7 +82,7 @@ namespace Eval::NNUE::Features { static constexpr IndexType kBaseDimensions = FeatureType::kDimensions; static constexpr std::string get_name() { - return FeatureType::kName; + return Factorizer::get_name(); } static constexpr std::string get_factorizers_string() { diff --git a/src/nnue/trainer/features/factorizer_half_ka.h b/src/nnue/trainer/features/factorizer_half_ka.h index 90bd9d97..36d36a2d 100644 --- a/src/nnue/trainer/features/factorizer_half_ka.h +++ b/src/nnue/trainer/features/factorizer_half_ka.h @@ -31,11 +31,11 @@ namespace Eval::NNUE::Features { // Learning feature information static constexpr FeatureProperties kProperties[] = { - // kFeaturesHalfKPK + // kFeaturesHalfA {true, FeatureType::kDimensions}, - // kFeaturesPK + // kFeaturesA {true, Factorizer::get_dimensions()}, - // kFeaturesHalfRelativeKPK + // kFeaturesHalfRelativeKA {true, Factorizer>::get_dimensions()}, }; @@ -43,7 +43,7 @@ namespace Eval::NNUE::Features { public: static constexpr std::string get_name() { - return std::string("Factorizer<") + FeatureType::kName + ">"; + return std::string("Factorizer<") + FeatureType::kName + "> -> " + "A, HalfRelativeKA"; } static constexpr std::string get_factorizers_string() { @@ -59,18 +59,18 @@ namespace Eval::NNUE::Features { static void append_training_features( IndexType base_index, std::vector* training_features) { - // kFeaturesHalfKPK + // kFeaturesHalfA IndexType index_offset = append_base_feature( kProperties[kFeaturesHalfKA], base_index, training_features); const auto sq_k = static_cast(base_index / PS_END2); const auto a = static_cast(base_index % PS_END2); - // kFeaturesPK + // kFeaturesA index_offset += inherit_features_if_required( index_offset, kProperties[kFeaturesA], a, training_features); - // kFeaturesHalfRelativeKPK + // kFeaturesHalfRelativeKA if (a >= PS_W_PAWN) { index_offset += inherit_features_if_required>( index_offset, kProperties[kFeaturesHalfRelativeKA], diff --git a/src/nnue/trainer/features/factorizer_half_kp.h b/src/nnue/trainer/features/factorizer_half_kp.h index 601ddfa5..c554f0fc 100644 --- a/src/nnue/trainer/features/factorizer_half_kp.h +++ b/src/nnue/trainer/features/factorizer_half_kp.h @@ -46,7 +46,7 @@ namespace Eval::NNUE::Features { public: static constexpr std::string get_name() { - return std::string("Factorizer<") + FeatureType::kName + ">"; + return std::string("Factorizer<") + FeatureType::kName + "> -> " + "HalfK, P, HalfRelativeKP"; } static constexpr std::string get_factorizers_string() {