From af1bc287bb82b8b9d3a1e3b2174bd55f8d2e6bca Mon Sep 17 00:00:00 2001 From: conrad Date: Tue, 6 Dec 2022 17:08:30 +1000 Subject: [PATCH] simplifications --- include/armadillo_bits/constants_old.hpp | 159 ++++++----------------- 1 file changed, 38 insertions(+), 121 deletions(-) diff --git a/include/armadillo_bits/constants_old.hpp b/include/armadillo_bits/constants_old.hpp index e154a978..6914428f 100644 --- a/include/armadillo_bits/constants_old.hpp +++ b/include/armadillo_bits/constants_old.hpp @@ -30,137 +30,54 @@ class Math { public: - // the long lengths of the constants are for future support of "long double" - // and any smart compiler that does high-precision computation at compile-time - - //! ratio of any circle's circumference to its diameter - arma_deprecated static eT pi() { return eT(Datum::pi); } // use datum::pi instead - - //! base of the natural logarithm - arma_deprecated static eT e() { return eT(Datum::e); } // use datum::e instead - - //! Euler's constant, aka Euler-Mascheroni constant - arma_deprecated static eT euler() { return eT(Datum::euler); } // use datum::euler instead - - //! golden ratio - arma_deprecated static eT gratio() { return eT(Datum::gratio); } // use datum::gratio instead - - //! square root of 2 - arma_deprecated static eT sqrt2() { return eT(Datum::sqrt2); } // use datum::sqrt2 instead - - //! the difference between 1 and the least value greater than 1 that is representable - arma_deprecated static eT eps() { return eT(Datum::eps); } // use datum::eps instead - - //! log of the minimum representable value - arma_deprecated static eT log_min() { return eT(Datum::log_min); } // use datum::log_min instead - - //! log of the maximum representable value - arma_deprecated static eT log_max() { return eT(Datum::log_max); } // use datum::log_max instead - - //! "not a number" - arma_deprecated static eT nan() { return eT(Datum::nan); } // use datum::nan instead - - //! infinity - arma_deprecated static eT inf() { return eT(Datum::inf); } // use datum::inf instead + arma_deprecated static eT pi() { return eT(Datum::pi); } + arma_deprecated static eT e() { return eT(Datum::e); } + arma_deprecated static eT euler() { return eT(Datum::euler); } + arma_deprecated static eT gratio() { return eT(Datum::gratio); } + arma_deprecated static eT sqrt2() { return eT(Datum::sqrt2); } + arma_deprecated static eT eps() { return eT(Datum::eps); } + arma_deprecated static eT log_min() { return eT(Datum::log_min); } + arma_deprecated static eT log_max() { return eT(Datum::log_max); } + arma_deprecated static eT nan() { return eT(Datum::nan); } + arma_deprecated static eT inf() { return eT(Datum::inf); } }; -//! Physical constants taken from NIST 2010 CODATA values, and some from WolframAlpha (values provided as of 2009-06-23) -//! http://physics.nist.gov/cuu/Constants -//! http://www.wolframalpha.com -//! See also http://en.wikipedia.org/wiki/Physical_constant template class Phy { public: - //! atomic mass constant (in kg) - arma_deprecated static eT m_u() { return eT(Datum::m_u); } - - //! Avogadro constant - arma_deprecated static eT N_A() { return eT(Datum::N_A); } - - //! Boltzmann constant (in joules per kelvin) - arma_deprecated static eT k() { return eT(Datum::k); } - - //! Boltzmann constant (in eV/K) - arma_deprecated static eT k_evk() { return eT(Datum::k_evk); } - - //! Bohr radius (in meters) - arma_deprecated static eT a_0() { return eT(Datum::a_0); } - - //! Bohr magneton - arma_deprecated static eT mu_B() { return eT(Datum::mu_B); } - - //! characteristic impedance of vacuum (in ohms) - arma_deprecated static eT Z_0() { return eT(Datum::Z_0); } - - //! conductance quantum (in siemens) - arma_deprecated static eT G_0() { return eT(Datum::G_0); } - - //! Coulomb's constant (in meters per farad) - arma_deprecated static eT k_e() { return eT(Datum::k_e); } - - //! electric constant (in farads per meter) - arma_deprecated static eT eps_0() { return eT(Datum::eps_0); } - - //! electron mass (in kg) - arma_deprecated static eT m_e() { return eT(Datum::m_e); } - - //! electron volt (in joules) - arma_deprecated static eT eV() { return eT(Datum::eV); } - - //! elementary charge (in coulombs) - arma_deprecated static eT e() { return eT(Datum::ec); } - - //! Faraday constant (in coulombs) - arma_deprecated static eT F() { return eT(Datum::F); } - - //! fine-structure constant - arma_deprecated static eT alpha() { return eT(Datum::alpha); } - - //! inverse fine-structure constant + arma_deprecated static eT m_u() { return eT(Datum::m_u); } + arma_deprecated static eT N_A() { return eT(Datum::N_A); } + arma_deprecated static eT k() { return eT(Datum::k); } + arma_deprecated static eT k_evk() { return eT(Datum::k_evk); } + arma_deprecated static eT a_0() { return eT(Datum::a_0); } + arma_deprecated static eT mu_B() { return eT(Datum::mu_B); } + arma_deprecated static eT Z_0() { return eT(Datum::Z_0); } + arma_deprecated static eT G_0() { return eT(Datum::G_0); } + arma_deprecated static eT k_e() { return eT(Datum::k_e); } + arma_deprecated static eT eps_0() { return eT(Datum::eps_0); } + arma_deprecated static eT m_e() { return eT(Datum::m_e); } + arma_deprecated static eT eV() { return eT(Datum::eV); } + arma_deprecated static eT e() { return eT(Datum::ec); } + arma_deprecated static eT F() { return eT(Datum::F); } + arma_deprecated static eT alpha() { return eT(Datum::alpha); } arma_deprecated static eT alpha_inv() { return eT(Datum::alpha_inv); } - - //! Josephson constant - arma_deprecated static eT K_J() { return eT(Datum::K_J); } - - //! magnetic constant (in henries per meter) - arma_deprecated static eT mu_0() { return eT(Datum::mu_0); } - - //! magnetic flux quantum (in webers) - arma_deprecated static eT phi_0() { return eT(Datum::phi_0); } - - //! molar gas constant (in joules per mole kelvin) - arma_deprecated static eT R() { return eT(Datum::R); } - - //! Newtonian constant of gravitation (in newton square meters per kilogram squared) - arma_deprecated static eT G() { return eT(Datum::G); } - - //! Planck constant (in joule seconds) - arma_deprecated static eT h() { return eT(Datum::h); } - - //! Planck constant over 2 pi, aka reduced Planck constant (in joule seconds) - arma_deprecated static eT h_bar() { return eT(Datum::h_bar); } - - //! proton mass (in kg) - arma_deprecated static eT m_p() { return eT(Datum::m_p); } - - //! Rydberg constant (in reciprocal meters) - arma_deprecated static eT R_inf() { return eT(Datum::R_inf); } - - //! speed of light in vacuum (in meters per second) - arma_deprecated static eT c_0() { return eT(Datum::c_0); } - - //! Stefan-Boltzmann constant - arma_deprecated static eT sigma() { return eT(Datum::sigma); } - - //! von Klitzing constant (in ohms) - arma_deprecated static eT R_k() { return eT(Datum::R_k); } - - //! Wien wavelength displacement law constant - arma_deprecated static eT b() { return eT(Datum::b); } + arma_deprecated static eT K_J() { return eT(Datum::K_J); } + arma_deprecated static eT mu_0() { return eT(Datum::mu_0); } + arma_deprecated static eT phi_0() { return eT(Datum::phi_0); } + arma_deprecated static eT R() { return eT(Datum::R); } + arma_deprecated static eT G() { return eT(Datum::G); } + arma_deprecated static eT h() { return eT(Datum::h); } + arma_deprecated static eT h_bar() { return eT(Datum::h_bar); } + arma_deprecated static eT m_p() { return eT(Datum::m_p); } + arma_deprecated static eT R_inf() { return eT(Datum::R_inf); } + arma_deprecated static eT c_0() { return eT(Datum::c_0); } + arma_deprecated static eT sigma() { return eT(Datum::sigma); } + arma_deprecated static eT R_k() { return eT(Datum::R_k); } + arma_deprecated static eT b() { return eT(Datum::b); } };