2023-06-26 23:21:40 +00:00
|
|
|
/*
|
|
|
|
* This program source code file
|
|
|
|
* is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2021-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation, either version 3 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "resistor_substitution_utils.h"
|
2023-09-22 21:43:09 +00:00
|
|
|
#include <algorithm>
|
|
|
|
#include <cmath>
|
|
|
|
#include <functional>
|
|
|
|
#include <stdexcept>
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
// If BENCHMARK is defined, calculations will print their execution time to the STDERR
|
|
|
|
// #define BENCHMARK
|
2023-06-26 23:21:40 +00:00
|
|
|
|
|
|
|
#ifdef BENCHMARK
|
2023-09-07 11:22:10 +00:00
|
|
|
#include <core/profile.h>
|
2023-06-26 23:21:40 +00:00
|
|
|
#endif
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
// Comparison operators used by std::sort and std::lower_bound
|
|
|
|
bool operator<( const RESISTANCE& aLhs, double aRhs )
|
|
|
|
{
|
|
|
|
return aLhs.value < aRhs;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator<( const RESISTANCE& aLhs, const RESISTANCE& aRhs )
|
|
|
|
{
|
|
|
|
return aLhs.value < aRhs.value;
|
|
|
|
}
|
|
|
|
|
|
|
|
class SolutionCollector
|
|
|
|
/**
|
|
|
|
* Helper class that collects solutions and keeps one with the best deviation.
|
|
|
|
* In order to avoid performing costly string operations too frequently,
|
|
|
|
* they are postponed until the very end, when we know the best combination.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
SolutionCollector( double aTarget ) : m_target( aTarget ) {}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Add two solutions, based on single 2R buffer lookup, to the collector.
|
|
|
|
*
|
|
|
|
* @param aResults are the resistances found in 2R buffer
|
|
|
|
* @param aValueFunc transforms value from aResults into final value of the combination
|
|
|
|
* @param aResultFunc transforms RESISTANCE instance from aResults into final instance
|
|
|
|
*/
|
|
|
|
void Add2RLookupResults( std::pair<RESISTANCE&, RESISTANCE&> aResults,
|
|
|
|
std::function<double( double )> aValueFunc,
|
|
|
|
std::function<RESISTANCE( RESISTANCE& )> aResultFunc )
|
|
|
|
{
|
|
|
|
addSolution( aValueFunc( aResults.first.value ), &aResults.first, aResultFunc );
|
|
|
|
addSolution( aValueFunc( aResults.second.value ), &aResults.second, aResultFunc );
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Return the best collected combination, running the corresponding result_func.
|
|
|
|
*/
|
|
|
|
RESISTANCE GetBest()
|
|
|
|
{
|
|
|
|
if( !m_best_found_resistance )
|
|
|
|
throw std::logic_error( "Empty solution collector" );
|
|
|
|
|
|
|
|
return m_best_result_func( *m_best_found_resistance );
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
/**
|
|
|
|
* Add single solution to the collector.
|
|
|
|
*
|
|
|
|
* @param aValue is a value of the combination in Ohms
|
|
|
|
* @param aFound is the corresponding RESISTANCE found in 2R buffer
|
|
|
|
* @param aResultFunc is a function calculating final result (RESISTANCE instance)
|
|
|
|
* for this combination
|
|
|
|
*/
|
|
|
|
void addSolution( double aValue, RESISTANCE *aFound,
|
|
|
|
std::function<RESISTANCE( RESISTANCE& )> aResultFunc )
|
|
|
|
{
|
|
|
|
double deviation = std::abs( aValue - m_target );
|
|
|
|
if( deviation < m_best_deviation )
|
|
|
|
{
|
|
|
|
m_best_deviation = deviation;
|
|
|
|
m_best_found_resistance = aFound;
|
|
|
|
m_best_result_func = aResultFunc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
double m_target;
|
|
|
|
double m_best_deviation = INFINITY;
|
|
|
|
RESISTANCE* m_best_found_resistance = nullptr;
|
|
|
|
std::function<RESISTANCE( RESISTANCE& )> m_best_result_func;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* If aText contains aRequiredSymbol as top-level (i.e. not in parentheses) operator,
|
|
|
|
* return aText enclosed in parentheses.
|
|
|
|
* Otherwise, return aText unmodified.
|
|
|
|
*/
|
|
|
|
static std::string maybeEmbrace( const std::string& aText, char aRequiredSymbol )
|
|
|
|
{
|
|
|
|
bool shouldEmbrace = false;
|
|
|
|
|
|
|
|
// scan for required top-level symbol
|
|
|
|
int parenLevel = 0;
|
|
|
|
|
|
|
|
for( char c : aText )
|
|
|
|
{
|
|
|
|
if( c == '(' )
|
|
|
|
parenLevel++;
|
|
|
|
else if( c == ')' )
|
|
|
|
parenLevel--;
|
|
|
|
else if( c == aRequiredSymbol && parenLevel == 0 )
|
|
|
|
shouldEmbrace = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// embrace or not
|
|
|
|
if( shouldEmbrace )
|
|
|
|
return '(' + aText + ')';
|
|
|
|
else
|
|
|
|
return aText;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Functions calculating values and text representations of serial and parallel combinations.
|
|
|
|
* Functions marked as 'Simple' do not care about parentheses, which makes them faster.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline double serialValue( double aR1, double aR2 )
|
|
|
|
{
|
|
|
|
return aR1 + aR2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline double parallelValue( double aR1, double aR2 )
|
|
|
|
{
|
|
|
|
return aR1 * aR2 / ( aR1 + aR2 );
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
static inline RESISTANCE serialResistance( const RESISTANCE& aR1, const RESISTANCE& aR2 )
|
|
|
|
{
|
|
|
|
std::string name = maybeEmbrace( aR1.name, '|' ) + " + " + maybeEmbrace( aR2.name, '|' );
|
|
|
|
return RESISTANCE( serialValue( aR1.value, aR2.value ), name );
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline RESISTANCE parallelResistance( const RESISTANCE& aR1, const RESISTANCE& aR2 )
|
|
|
|
{
|
|
|
|
std::string name = maybeEmbrace( aR1.name, '+' ) + " | " + maybeEmbrace( aR2.name, '+' );
|
|
|
|
return RESISTANCE( parallelValue( aR1.value, aR2.value ), name );
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline RESISTANCE serialResistanceSimple( const RESISTANCE& aR1, const RESISTANCE& aR2 )
|
|
|
|
{
|
|
|
|
std::string name = aR1.name + " + " + aR2.name;
|
|
|
|
return RESISTANCE( serialValue( aR1.value, aR2.value ), name );
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline RESISTANCE parallelResistanceSimple( const RESISTANCE& aR1, const RESISTANCE& aR2 )
|
|
|
|
{
|
|
|
|
std::string name = aR1.name + " | " + aR2.name;
|
|
|
|
return RESISTANCE( parallelValue( aR1.value, aR2.value ), name );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return a string from aValue (aValue is expected in ohms).
|
|
|
|
// If aValue < 1000 the returned string is aValue with unit = R.
|
2023-06-26 23:21:40 +00:00
|
|
|
// If aValue >= 1000 the returned string is aValue/1000 with unit = K
|
2023-09-22 21:43:09 +00:00
|
|
|
// with notation similar to 2K2.
|
2023-06-26 23:21:40 +00:00
|
|
|
// If aValue >= 1e6 the returned string is aValue/1e6 with unit = M
|
2023-09-22 21:43:09 +00:00
|
|
|
// with notation = 1M.
|
2023-06-26 23:21:40 +00:00
|
|
|
static std::string strValue( double aValue )
|
|
|
|
{
|
|
|
|
std::string result;
|
|
|
|
|
|
|
|
if( aValue < 1000.0 )
|
|
|
|
{
|
|
|
|
result = std::to_string( static_cast<int>( aValue ) );
|
|
|
|
result += 'R';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
double div = 1e3;
|
|
|
|
char unit = 'K';
|
|
|
|
|
|
|
|
if( aValue >= 1e6 )
|
|
|
|
{
|
|
|
|
div = 1e6;
|
|
|
|
unit = 'M';
|
|
|
|
}
|
|
|
|
|
|
|
|
aValue /= div;
|
|
|
|
|
|
|
|
int valueAsInt = static_cast<int>( aValue );
|
|
|
|
result = std::to_string( valueAsInt );
|
|
|
|
result += unit;
|
|
|
|
|
|
|
|
// Add mantissa: 1 digit, suitable for series up to E24
|
|
|
|
double mantissa = aValue - valueAsInt;
|
|
|
|
|
|
|
|
if( mantissa > 0 )
|
2023-09-22 21:43:09 +00:00
|
|
|
result += std::to_string( lround( mantissa * 10 ) );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
RES_EQUIV_CALC::RES_EQUIV_CALC()
|
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
// series must be added to vector in correct order
|
|
|
|
m_e_series.push_back( buildSeriesData( ESERIES::E1_VALUES() ) );
|
|
|
|
m_e_series.push_back( buildSeriesData( ESERIES::E3_VALUES() ) );
|
|
|
|
m_e_series.push_back( buildSeriesData( ESERIES::E6_VALUES() ) );
|
|
|
|
m_e_series.push_back( buildSeriesData( ESERIES::E12_VALUES() ) );
|
|
|
|
m_e_series.push_back( buildSeriesData( ESERIES::E24_VALUES() ) );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::SetSeries( uint32_t aSeries )
|
|
|
|
{
|
|
|
|
m_series = aSeries;
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::NewCalc( double aTargetValue )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
m_target = aTargetValue;
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
m_exclude_mask.resize( m_e_series[m_series].size() );
|
|
|
|
std::fill( m_exclude_mask.begin(), m_exclude_mask.end(), false );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
std::fill( m_results.begin(), m_results.end(), std::nullopt );
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::Exclude( double aValue )
|
|
|
|
{
|
|
|
|
if( std::isnan( aValue ) )
|
|
|
|
return;
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
std::vector<RESISTANCE>& series = m_e_series[m_series];
|
|
|
|
auto it = std::lower_bound( series.begin(), series.end(), aValue - epsilon );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
if( it != series.end() && std::abs( it->value - aValue ) < epsilon )
|
|
|
|
m_exclude_mask[it - series.begin()] = true;
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::Calculate()
|
|
|
|
{
|
|
|
|
#ifdef BENCHMARK
|
|
|
|
PROF_TIMER timer( "Resistor calculation" );
|
|
|
|
#endif
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
prepare1RBuffer();
|
|
|
|
prepare2RBuffer();
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
RESISTANCE solution_2r = calculate2RSolution();
|
|
|
|
m_results[S2R] = solution_2r;
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
if( std::abs( solution_2r.value - m_target ) > epsilon )
|
|
|
|
{
|
|
|
|
RESISTANCE solution_3r = calculate3RSolution();
|
|
|
|
m_results[S3R] = solution_3r;
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
if( std::abs( solution_3r.value - m_target ) > epsilon )
|
|
|
|
m_results[S4R] = calculate4RSolution();
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
#ifdef BENCHMARK
|
|
|
|
timer.Show();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<RESISTANCE> RES_EQUIV_CALC::buildSeriesData( const ESERIES::ESERIES_VALUES& aList )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
std::vector<RESISTANCE> result_list;
|
|
|
|
|
|
|
|
for( double curr_decade = RES_EQUIV_CALC_FIRST_VALUE;; curr_decade *= 10.0 ) // iterate over decades
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
double multiplier = curr_decade / aList[0];
|
|
|
|
|
|
|
|
for( const uint16_t listvalue : aList ) // iterate over values in decade
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
double value = multiplier * listvalue;
|
|
|
|
result_list.emplace_back( value, strValue( value ) );
|
|
|
|
|
|
|
|
if( value >= RES_EQUIV_CALC_LAST_VALUE )
|
|
|
|
return result_list;
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::prepare1RBuffer()
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
std::vector<RESISTANCE>& series = m_e_series[m_series];
|
|
|
|
m_buffer_1R.clear();
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
for( size_t i = 0; i < series.size(); i++ )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
if( !m_exclude_mask[i] )
|
|
|
|
m_buffer_1R.push_back( series[i] );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
void RES_EQUIV_CALC::prepare2RBuffer()
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
m_buffer_2R.clear();
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
for( size_t i1 = 0; i1 < m_buffer_1R.size(); i1++ )
|
|
|
|
{
|
|
|
|
for( size_t i2 = i1; i2 < m_buffer_1R.size(); i2++ )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
m_buffer_2R.push_back( serialResistanceSimple( m_buffer_1R[i1], m_buffer_1R[i2] ) );
|
|
|
|
m_buffer_2R.push_back( parallelResistanceSimple( m_buffer_1R[i1], m_buffer_1R[i2] ) );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
std::sort( m_buffer_2R.begin(), m_buffer_2R.end() );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
std::pair<RESISTANCE&, RESISTANCE&> RES_EQUIV_CALC::findIn2RBuffer( double aTarget )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
// in case of NaN, return anything valid
|
|
|
|
if( std::isnan( aTarget ) )
|
|
|
|
return { m_buffer_2R[0], m_buffer_2R[0] };
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
// target value is often too small or too big, so check that manually
|
|
|
|
if( aTarget <= m_buffer_2R.front().value || aTarget >= m_buffer_2R.back().value )
|
|
|
|
return { m_buffer_2R.front(), m_buffer_2R.back() };
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
auto it = std::lower_bound( m_buffer_2R.begin(), m_buffer_2R.end(), aTarget )
|
|
|
|
- m_buffer_2R.begin();
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
if( it == 0 )
|
|
|
|
return { m_buffer_2R[0], m_buffer_2R[0] };
|
|
|
|
else if( it == m_buffer_2R.size() )
|
|
|
|
return { m_buffer_2R[it - 1], m_buffer_2R[it - 1] };
|
|
|
|
else
|
|
|
|
return { m_buffer_2R[it - 1], m_buffer_2R[it] };
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
RESISTANCE RES_EQUIV_CALC::calculate2RSolution()
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
SolutionCollector solution( m_target );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
auto valueFunc = []( double aFoundValue )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
return aFoundValue;
|
|
|
|
};
|
|
|
|
auto resultFunc = []( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return aFoundRes;
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults( findIn2RBuffer( m_target ), valueFunc, resultFunc );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
return solution.GetBest();
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
RESISTANCE RES_EQUIV_CALC::calculate3RSolution()
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
SolutionCollector solution( m_target );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
for( RESISTANCE& r : m_buffer_1R )
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
// try r + 2R combination
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return serialValue( aFoundValue, r.value );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return serialResistance( aFoundRes, r );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults( findIn2RBuffer( m_target - r.value ), valueFunc,
|
|
|
|
resultFunc );
|
|
|
|
}
|
|
|
|
|
|
|
|
// try r | 2R combination
|
|
|
|
{
|
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return parallelValue( aFoundValue, r.value );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return parallelResistance( aFoundRes, r );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults(
|
|
|
|
findIn2RBuffer( m_target * r.value / ( r.value - m_target ) ), valueFunc,
|
|
|
|
resultFunc );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
return solution.GetBest();
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
RESISTANCE RES_EQUIV_CALC::calculate4RSolution()
|
2023-06-26 23:21:40 +00:00
|
|
|
{
|
2023-09-22 21:43:09 +00:00
|
|
|
SolutionCollector solution( m_target );
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
for( RESISTANCE& rr : m_buffer_2R )
|
|
|
|
{
|
|
|
|
// try 2R + 2R combination
|
|
|
|
{
|
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return serialValue( aFoundValue, rr.value );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return serialResistance( aFoundRes, rr );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults( findIn2RBuffer( m_target - rr.value ), valueFunc,
|
|
|
|
resultFunc );
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
// try 2R | 2R combination
|
|
|
|
{
|
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return parallelValue( aFoundValue, rr.value );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return parallelResistance( aFoundRes, rr );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults(
|
|
|
|
findIn2RBuffer( m_target * rr.value / ( rr.value - m_target ) ), valueFunc,
|
|
|
|
resultFunc );
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
for( RESISTANCE& r1 : m_buffer_1R )
|
|
|
|
{
|
|
|
|
for( RESISTANCE& r2 : m_buffer_1R )
|
|
|
|
{
|
|
|
|
// try r1 + (r2 | 2R)
|
|
|
|
{
|
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return serialValue( r1.value, parallelValue( r2.value, aFoundValue ) );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return serialResistance( r1, parallelResistance( r2, aFoundRes ) );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults( findIn2RBuffer( ( m_target - r1.value ) * r2.value
|
|
|
|
/ ( r1.value + r2.value - m_target ) ),
|
|
|
|
valueFunc, resultFunc );
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
|
2023-09-22 21:43:09 +00:00
|
|
|
// try r1 | (r2 + 2R)
|
|
|
|
{
|
|
|
|
auto valueFunc = [&]( double aFoundValue )
|
|
|
|
{
|
|
|
|
return parallelValue( r1.value, serialValue( r2.value, aFoundValue ) );
|
|
|
|
};
|
|
|
|
auto resultFunc = [&]( RESISTANCE& aFoundRes )
|
|
|
|
{
|
|
|
|
return parallelResistance( r1, serialResistance( r2, aFoundRes ) );
|
|
|
|
};
|
|
|
|
solution.Add2RLookupResults(
|
|
|
|
findIn2RBuffer( m_target * r1.value / ( r1.value - m_target ) - r2.value ),
|
|
|
|
valueFunc, resultFunc );
|
|
|
|
}
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|
|
|
|
}
|
2023-09-22 21:43:09 +00:00
|
|
|
|
|
|
|
return solution.GetBest();
|
2023-06-26 23:21:40 +00:00
|
|
|
}
|