diff options
Diffstat (limited to 'src/lib/netlist/analog/nlid_fourterm.cpp')
-rw-r--r-- | src/lib/netlist/analog/nlid_fourterm.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/netlist/analog/nlid_fourterm.cpp b/src/lib/netlist/analog/nlid_fourterm.cpp index f4451c55023..9323e7fc649 100644 --- a/src/lib/netlist/analog/nlid_fourterm.cpp +++ b/src/lib/netlist/analog/nlid_fourterm.cpp @@ -24,16 +24,16 @@ namespace netlist NETLIB_RESET(VCCS) { const nl_double m_mult = m_G() * m_gfac; // 1.0 ==> 1V ==> 1A - const nl_double GI = plib::constants<nl_double>::one / m_RI(); + const nl_double GI = plib::constants<nl_double>::one() / m_RI(); m_IP.set(GI); m_IN.set(GI); - m_OP.set(m_mult, plib::constants<nl_double>::zero); - m_OP1.set(-m_mult, plib::constants<nl_double>::zero); + m_OP.set(m_mult, plib::constants<nl_double>::zero()); + m_OP1.set(-m_mult, plib::constants<nl_double>::zero()); - m_ON.set(-m_mult, plib::constants<nl_double>::zero); - m_ON1.set(m_mult, plib::constants<nl_double>::zero); + m_ON.set(-m_mult, plib::constants<nl_double>::zero()); + m_ON1.set(m_mult, plib::constants<nl_double>::zero()); } NETLIB_UPDATE(VCCS) @@ -79,11 +79,11 @@ NETLIB_UPDATE_TERMINALS(LVCCS) const nl_double beta = m_mult * (1.0 - X*X); const nl_double I = m_cur_limit() * X - beta * m_vi; - m_OP.set(beta, plib::constants<nl_double>::zero, I); - m_OP1.set(-beta, plib::constants<nl_double>::zero); + m_OP.set(beta, plib::constants<nl_double>::zero(), I); + m_OP1.set(-beta, plib::constants<nl_double>::zero()); - m_ON.set(-beta, plib::constants<nl_double>::zero, -I); - m_ON1.set(beta, plib::constants<nl_double>::zero); + m_ON.set(-beta, plib::constants<nl_double>::zero(), -I); + m_ON1.set(beta, plib::constants<nl_double>::zero()); } // ---------------------------------------------------------------------------------------- @@ -106,11 +106,11 @@ NETLIB_UPDATE_PARAM(CCCS) NETLIB_RESET(VCVS) { - m_gfac = plib::constants<nl_double>::one / m_RO(); + m_gfac = plib::constants<nl_double>::one() / m_RO(); NETLIB_NAME(VCCS)::reset(); - m_OP2.set(plib::constants<nl_double>::one / m_RO()); - m_ON2.set(plib::constants<nl_double>::one / m_RO()); + m_OP2.set(plib::constants<nl_double>::one() / m_RO()); + m_ON2.set(plib::constants<nl_double>::one() / m_RO()); } } //namespace analog |