diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2015-01-29 08:56:43 -0700 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2015-01-29 08:56:43 -0700 |
| commit | 14419813582bc89334d2e9d5bdd74b5852bfc9f9 (patch) | |
| tree | 9b6dff56e27d485652dfd019391aef4845ff01c1 /src/unitnumber.cpp | |
| parent | 42e77eb7ba24d2b7ebd47fadbc9240dc4520a5d6 (diff) | |
| parent | f03026f5c2cde1eecfda273eaa52df10287f0f9e (diff) | |
| download | clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.gz clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.bz2 clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.xz clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.zip | |
Merge branch 'master' of /home/eichlan/git/clic
Diffstat (limited to 'src/unitnumber.cpp')
| -rw-r--r-- | src/unitnumber.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/unitnumber.cpp b/src/unitnumber.cpp index 985f0d9..d213ed7 100644 --- a/src/unitnumber.cpp +++ b/src/unitnumber.cpp | |||
| @@ -136,13 +136,17 @@ void UnitNumber::number1() | |||
| 136 | 136 | ||
| 137 | #define mathTest( anum, op, bnum, scale, answ ) \ | 137 | #define mathTest( anum, op, bnum, scale, answ ) \ |
| 138 | unitTest( (Number(anum, scale) op Number(bnum, scale)).toString() == answ ) | 138 | unitTest( (Number(anum, scale) op Number(bnum, scale)).toString() == answ ) |
| 139 | /* | 139 | |
| 140 | void UnitNumber::number2() | 140 | void UnitNumber::number2() |
| 141 | { | 141 | { |
| 142 | mathTest( "1", /, "17", 10, "0.0588235294" ); | 142 | mathTest("55", +, "-100", 0, "-45"); |
| 143 | mathTest( "1", /, "177", 10, "0.0056497175" ); | 143 | mathTest("30.01", +, "-31.21", 2, "-1.20"); |
| 144 | mathTest("55", -, "100", 0, "-45"); | ||
| 145 | mathTest("30.01", -, "31.21", 2, "-1.20"); | ||
| 146 | // mathTest( "1", /, "17", 10, "0.0588235294" ); | ||
| 147 | // mathTest( "1", /, "177", 10, "0.0056497175" ); | ||
| 144 | } | 148 | } |
| 145 | */ | 149 | |
| 146 | 150 | ||
| 147 | /* | 151 | /* |
| 148 | // clic | 152 | // clic |