Remove Benchmarking output and clarify exclusion

By default, the e series calculator does not return the input value.
This would be counter-productive b/c if you are looking for a new value,
we assume that is because you do not already have the existing value to
hand.
This commit is contained in:
Seth Hillbrand 2021-01-24 11:41:43 -08:00
parent 47d5900600
commit 321c9f81af
3 changed files with 16 additions and 24 deletions

View File

@ -29,7 +29,7 @@ extern double DoubleFromString( const wxString& TextValue );
* My Hasswell Enthusiast reports 225 mSec what are reproducable within plusminus 2 percent
*/
#define BENCHMARK
//#define BENCHMARK
/**
* E-Values derived from a geometric sequence formula by Charles Renard were already

View File

@ -10,14 +10,10 @@ _HKI( "E-series defined in IEC 60063 are a widely accepted system of preferred\n
"\n"
"This calculator finds combinations of standard E-series components to\n"
"create arbitrary values. You can enter the required resistance from 0,0025 to 4000 kOhm. \n"
"Solutions using up to 3 components are given. \n"
"Solutions using up to 4 components are given. \n"
"\n"
"If a closer solutions is needed, the 4R checkbox option will give solutions \n"
"using 4 components for the E12 series only. This option\n"
"may take longer to compute. \n"
"\n"
"It is also possible to specify up to two values to exclude from the solution if these\n"
"component values are not available\n"
"By default, the request value is always excluded from the solution set. It is also possible to specify\n"
"up to two additional values to exclude from the solution if these component values are not available\n"
"\n"
"Solutions are given in the following formats:\n"
"\n"

View File

@ -9,14 +9,10 @@ equally spaced in a logarithmic scale.
This calculator finds combinations of standard E-series components to
create arbitrary values. You can enter the required resistance from 0,0025 to 4000 kOhm.
Solutions using up to 3 components are given.
Solutions using up to 4 components are given.
If a closer solutions is needed, the 4R checkbox option will give solutions
using 4 components for the E12 series only. This option
may take longer to compute.
It is also possible to specify up to two values to exclude from the solution if these
component values are not available
By default, the request value is always excluded from the solution set. It is also possible to specify
up to two additional values to exclude from the solution if these component values are not available
Solutions are given in the following formats: