diff options
| author | 2016-04-27 08:13:59 +0200 | |
|---|---|---|
| committer | 2016-04-27 08:13:59 +0200 | |
| commit | cfee536f22f032c7ead65075f73cc6fd8549e68b (patch) | |
| tree | f4b4703dd0295571684456c19668f508b3ddcb3a /src/lib/netlist/solver | |
| parent | be8159d01eaa7533e7758bf07384501dbc6214f3 (diff) | |
Cleanups and version bumpmame0173
Diffstat (limited to 'src/lib/netlist/solver')
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_direct.h | 4 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_sm.h | 4 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_sor_mat.h | 1 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_w.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_solver.cpp | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 91cb7c9385f..d6896cbe97d 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -46,7 +46,7 @@ struct ti_t volatile std::atomic<int> lo; thr_intf *intf; void *params; -// int _block[29]; /* make it 256 bytes */ +// int _block[29]; /* make it 256 bytes */ }; static ti_t ti[MAXTHR]; @@ -287,7 +287,7 @@ void matrix_solver_direct_t<m_N, _storage_N>::LE_solve() #else vec_add_mult_scalar(kN-i-1,pj,f1,pi); //for (unsigned k = i+1; k < kN; k++) - // pj[k] = pj[k] + pi[k] * f1; + // pj[k] = pj[k] + pi[k] * f1; //for (unsigned k = i+1; k < kN; k++) //A(j,k) += A(i,k) * f1; RHS(j) += RHS(i) * f1; diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index f83240c789a..f38ee5a5783 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -13,9 +13,9 @@ * In this specific implementation, u is a unit vector specifying the row which * changed. Thus v contains the changed column. * - * Than z = A⁻¹ u , w = transpose(A⁻¹) v , lambda = v z + * Than z = A^-1 u , w = transpose(A^-1) v , lambda = v z * - * A⁻¹ <- 1.0 / (1.0 + lambda) * (z x w) + * A^-1 <- 1.0 / (1.0 + lambda) * (z x w) * * The approach is iterative and applied for each row changed. * diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h index b57ba3cded1..eb59a7a94ac 100644 --- a/src/lib/netlist/solver/nld_ms_sor_mat.h +++ b/src/lib/netlist/solver/nld_ms_sor_mat.h @@ -23,7 +23,6 @@ NETLIB_NAMESPACE_DEVICES_START() template <unsigned m_N, unsigned _storage_N> class matrix_solver_SOR_mat_t: public matrix_solver_direct_t<m_N, _storage_N> { - friend class matrix_solver_t; public: diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h index fe7a4389566..89f83dea6cc 100644 --- a/src/lib/netlist/solver/nld_ms_w.h +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -15,7 +15,7 @@ * Whilst the book proposes to invert the matrix R=(I+transpose(V)*Z) we define * * w = transpose(V)*y - * a = R⁻¹ * w + * a = R^-1 * w * * and consequently * diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index 5341d1b70d1..9fa0ee16c60 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -180,7 +180,7 @@ ATTR_COLD void matrix_solver_t::setup_base(analog_net_t::list_t &nets) if (net_proxy_output == nullptr) { //net_proxy_output = palloc(analog_output_t(*this, - // this->name() + "." + pfmt("m{1}")(m_inps.size()))); + // this->name() + "." + pfmt("m{1}")(m_inps.size()))); net_proxy_output = palloc(analog_output_t); net_proxy_output->init_object(*this, this->name() + "." + pfmt("m{1}")(m_inps.size())); |
