mirror of
https://github.com/Relintai/pmlpp.git
synced 2024-12-22 15:06:47 +01:00
Ranemd contraharmonic_mean to contra_harmonic_mean.
This commit is contained in:
parent
25ce447853
commit
4b7e133753
@ -294,7 +294,7 @@ real_t MLPPStat::heronian_mean(const real_t A, const real_t B) {
|
|||||||
return (A + sqrt(A * B) + B) / 3;
|
return (A + sqrt(A * B) + B) / 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
real_t MLPPStat::contraharmonic_mean(const Ref<MLPPVector> &x) {
|
real_t MLPPStat::contra_harmonic_mean(const Ref<MLPPVector> &x) {
|
||||||
ERR_FAIL_COND_V(!x.is_valid(), 0);
|
ERR_FAIL_COND_V(!x.is_valid(), 0);
|
||||||
|
|
||||||
return lehmer_mean(x, 2);
|
return lehmer_mean(x, 2);
|
||||||
@ -359,7 +359,7 @@ void MLPPStat::_bind_methods() {
|
|||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("weighted_lehmer_mean", "x", "weights", "p"), &MLPPStat::weighted_lehmer_mean);
|
ClassDB::bind_method(D_METHOD("weighted_lehmer_mean", "x", "weights", "p"), &MLPPStat::weighted_lehmer_mean);
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("contraharmonic_mean", "x"), &MLPPStat::contraharmonic_mean);
|
ClassDB::bind_method(D_METHOD("contra_harmonic_mean", "x"), &MLPPStat::contra_harmonic_mean);
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("heronian_mean", "A", "B"), &MLPPStat::heronian_mean);
|
ClassDB::bind_method(D_METHOD("heronian_mean", "A", "B"), &MLPPStat::heronian_mean);
|
||||||
ClassDB::bind_method(D_METHOD("heinz_mean", "A", "B", "x"), &MLPPStat::heinz_mean);
|
ClassDB::bind_method(D_METHOD("heinz_mean", "A", "B", "x"), &MLPPStat::heinz_mean);
|
||||||
|
@ -48,7 +48,7 @@ public:
|
|||||||
real_t power_mean(const Ref<MLPPVector> &x, const real_t p);
|
real_t power_mean(const Ref<MLPPVector> &x, const real_t p);
|
||||||
real_t lehmer_mean(const Ref<MLPPVector> &x, const real_t p);
|
real_t lehmer_mean(const Ref<MLPPVector> &x, const real_t p);
|
||||||
real_t weighted_lehmer_mean(const Ref<MLPPVector> &x, const Ref<MLPPVector> &weights, const real_t p);
|
real_t weighted_lehmer_mean(const Ref<MLPPVector> &x, const Ref<MLPPVector> &weights, const real_t p);
|
||||||
real_t contraharmonic_mean(const Ref<MLPPVector> &x);
|
real_t contra_harmonic_mean(const Ref<MLPPVector> &x);
|
||||||
real_t heronian_mean(const real_t A, const real_t B);
|
real_t heronian_mean(const real_t A, const real_t B);
|
||||||
real_t heinz_mean(const real_t A, const real_t B, const real_t x);
|
real_t heinz_mean(const real_t A, const real_t B, const real_t x);
|
||||||
real_t neuman_sandor_mean(const real_t a, const real_t b);
|
real_t neuman_sandor_mean(const real_t a, const real_t b);
|
||||||
|
Loading…
Reference in New Issue
Block a user