diff options
| author | Johannes 'josch' Schauer <josch@mister-muffin.de> | 2020-10-23 08:27:40 +0200 |
|---|---|---|
| committer | Johannes 'josch' Schauer <josch@mister-muffin.de> | 2020-10-23 08:27:40 +0200 |
| commit | 51c60cf399c1b02ceecc8cb0b466870a0e8bbcb4 (patch) | |
| tree | ac933d2b0a260d0686fff04a46eba3ff5282dac2 | |
| parent | 0c3c5eef00c4147e8502f36bca2e10a80c5fd5f3 (diff) | |
| parent | 3b91637afd9716881bec3a34c3ace369c82ef61c (diff) | |
Update upstream source from tag 'upstream/6.0+dfsg'
Update to upstream version '6.0+dfsg'
with Debian dir 492c862acb0ce669ccc877ced6b83da3a2c75e58
| -rw-r--r-- | fuzzylite/test/BenchmarkTest.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/fuzzylite/test/BenchmarkTest.cpp b/fuzzylite/test/BenchmarkTest.cpp index 2b97663..f868ec2 100644 --- a/fuzzylite/test/BenchmarkTest.cpp +++ b/fuzzylite/test/BenchmarkTest.cpp @@ -35,10 +35,31 @@ namespace fl { std::vector<Example> examples; examples.push_back(Example("mamdani/AllTerms", int(1e4))); examples.push_back(Example("mamdani/SimpleDimmer", int(1e5))); + examples.push_back(Example("mamdani/matlab/mam21", 128)); + examples.push_back(Example("mamdani/matlab/mam22", 128)); + examples.push_back(Example("mamdani/matlab/shower", 256)); + examples.push_back(Example("mamdani/matlab/tank", 256)); + examples.push_back(Example("mamdani/matlab/tank2", 512)); + examples.push_back(Example("mamdani/matlab/tipper", 256)); + examples.push_back(Example("mamdani/matlab/tipper1", int(1e5))); examples.push_back(Example("mamdani/octave/investment_portfolio", 256)); examples.push_back(Example("mamdani/octave/mamdani_tip_calculator", 256)); examples.push_back(Example("takagi-sugeno/approximation", int(1e6))); examples.push_back(Example("takagi-sugeno/SimpleDimmer", int(2e6))); + examples.push_back(Example("takagi-sugeno/matlab/fpeaks", 512)); + examples.push_back(Example("takagi-sugeno/matlab/invkine1", 256)); + examples.push_back(Example("takagi-sugeno/matlab/invkine2", 256)); + examples.push_back(Example("takagi-sugeno/matlab/juggler", 512)); + examples.push_back(Example("takagi-sugeno/matlab/membrn1", 1024)); + examples.push_back(Example("takagi-sugeno/matlab/membrn2", 512)); + examples.push_back(Example("takagi-sugeno/matlab/slbb", 20)); + examples.push_back(Example("takagi-sugeno/matlab/slcp", 20)); + examples.push_back(Example("takagi-sugeno/matlab/slcp1", 15)); + examples.push_back(Example("takagi-sugeno/matlab/slcpp1", 9)); + examples.push_back(Example("takagi-sugeno/matlab/sltbu_fl", 128)); + examples.push_back(Example("takagi-sugeno/matlab/sugeno1", int(2e6))); + examples.push_back(Example("takagi-sugeno/matlab/tanksg", 1024)); + examples.push_back(Example("takagi-sugeno/matlab/tippersg", 1024)); examples.push_back(Example("takagi-sugeno/octave/cubic_approximator", int(2e6))); examples.push_back(Example("takagi-sugeno/octave/heart_disease_risk", 1024)); examples.push_back(Example("takagi-sugeno/octave/linear_tip_calculator", 1024)); @@ -96,17 +117,7 @@ namespace fl { CHECK(Op::isEq(1.0, Benchmark::convert(1000.0, Benchmark::MilliSeconds, Benchmark::Seconds))); FL_LOG(Benchmark::convert(1000.0, Benchmark::MilliSeconds, Benchmark::Seconds)); - scalar eps = -#ifndef __i386__ - fuzzylite::macheps(); -#else - // on i386, due to the 80bit x87 register, double floating point - // numbers are handled differently and thus the difference between - // 35e9 and the result of Benchmark::convert() will be 2.179e-6, - // which is greater than the default epsilon of 1e-6. - 1e-5; -#endif - CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, Benchmark::NanoSeconds), eps)); + CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, Benchmark::NanoSeconds))); CHECK(Op::isEq(35, Benchmark::convert(35e9, Benchmark::NanoSeconds, Benchmark::Seconds))); } |