From c7c859fc762ba7e4d0e9983315131b357a1e548d Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 16 Feb 2009 17:57:34 +0000 Subject: [PATCH] changed: UInt::FromString(...) skips the input digits when the value is too big added: tests: addtwoints (only 32bit) git-svn-id: svn://ttmath.org/publicrep/ttmath/trunk@95 e52654a7-88a9-db11-a3e9-0013d4bc506e --- tests/main.cpp | 1 + tests/tests.uint32 | 65 ++++++-------------- tests/uinttest.cpp | 140 ++++++++++++++++++++++++++++++++++++++------ tests/uinttest.h | 11 +++- ttmath/ttmathuint.h | 17 +++--- 5 files changed, 161 insertions(+), 73 deletions(-) diff --git a/tests/main.cpp b/tests/main.cpp index 71d1a9f..25d458f 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -46,6 +46,7 @@ const char uint_tests_file[] = "tests.uint32"; + bool test_lahf() { #ifdef TTMATH_PLATFORM64 diff --git a/tests/tests.uint32 b/tests/tests.uint32 index 2787792..4f16dba 100644 --- a/tests/tests.uint32 +++ b/tests/tests.uint32 @@ -6,8 +6,6 @@ add 32 0 1 1 2 0 add 32 0 2342234 3563456 5905690 0 add 32 0 254455 3453435 3707890 0 add 32 0 4294967295 0 4294967295 0 - -# testing a carry for add add 32 32 4294967295 1 0 1 add 32 32 4294967295 0 4294967295 0 add 64 64 18446744073709551615 1 0 1 @@ -49,50 +47,25 @@ addint 192 192 64 627710173538668076383578942320766641610 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# AddTwoInts +# a the value +# c lower word +# b higher word +# index - index of the lower (c) word +# if there is a carry the result is skipped + +# min_bits max_bits bits_per_int a b(int) c(int) index result carry +addtwoints 64 0 32 0 0 0 0 0 0 +addtwoints 64 0 32 23542345 3453245 2356252356 0 14831576719870221 0 +addtwoints 64 64 32 4563456879824345332 3453245255 3673623543 0 0 1 +addtwoints 96 0 32 345345634564352344231 1231354534 345324551 1 22714482299528678798871855271 0 +addtwoints 96 96 32 33333336690445123453645645123 4241542514 145235414 1 0 1 +addtwoints 128 0 32 921345787234870984751756 2356245656 3423623455 2 186681013820253010515426931265335245452 0 +addtwoints 128 128 32 259817508127340892734075234234345345346 3452345324 452354345 2 0 1 +addtwoints 160 0 32 458674036702857083457018457034 435236456 1451234242 1 466702732224470435083940719562 0 +addtwoints 160 0 32 258672084570198475012875019876674534523452543562 935245345 736765636 3 576919584276960743542382023227664277469907669578 0 +addtwoints 192 0 32 2398670187501982374012837086745045 3253453245 234567536 4 4754927244626858434362642830810490464530603685767816794581 0 +addtwoints 192 192 32 1734564564356435667546738087098769876387468736123143453646 3456345245 3256347435 4 0 1 diff --git a/tests/uinttest.cpp b/tests/uinttest.cpp index b4748b0..caf9e7b 100644 --- a/tests/uinttest.cpp +++ b/tests/uinttest.cpp @@ -46,24 +46,47 @@ void UIntTest::set_file_name(const std::string & f) } -uuint UIntTest::read_uint() +bool UIntTest::read_uint(uuint & result) { -uuint result = 0; - - skip_white_characters(); +UInt<1> temp; - for( ; *pline>='0' && *pline<='9' ; ++pline ) - result = result * 10 + (*pline - '0'); + int c = temp.FromString(pline, 10, &pline); -return result; + result = temp.ToUInt(); + + if( c ) + { + std::cerr << " carry from reading uint" << std::endl; + return false; + } + +return true; } +template +bool UIntTest::read_uint(UInt & result) +{ + int c = result.FromString(pline, 10, &pline); + + if( c ) + { + std::cerr << " carry from UInt<>::FromString()" << std::endl; + return false; + } + +return true; +} + + bool UIntTest::check_minmax_bits(int type_size) { - int min_bits = read_uint(); - int max_bits = read_uint(); + uuint min_bits; + uuint max_bits; + + read_uint(min_bits); + read_uint(max_bits); if( min_bits != 0 && type_size * TTMATH_BITS_PER_UINT < (unsigned int)min_bits ) return false; @@ -80,7 +103,9 @@ bool UIntTest::check_minmax_bits_bitperint(int type_size) if( !check_minmax_bits(type_size) ) return false; - int bits = read_uint(); + uuint bits; + + read_uint(bits); if( TTMATH_BITS_PER_UINT != bits ) return false; @@ -126,7 +151,27 @@ return ok; } +template +bool UIntTest::check_result_or_carry(const ttmath::UInt & result, const ttmath::UInt & new_result, + int carry, int new_carry) +{ + if( new_carry != carry ) + { + std::cerr << "Incorrect carry: " << new_carry << " (expected: " << carry << ")" << std::endl; + return false; + } + if( new_carry == 1 ) + return true; + + if( new_result != result ) + { + std::cerr << "Incorrect result: " << new_result << " (expected: " << result << ")" << std::endl; + return false; + } + +return true; +} @@ -138,10 +183,12 @@ void UIntTest::test_add() if( !check_minmax_bits(type_size) ) return; - a.FromString(pline, 10, &pline); - b.FromString(pline, 10, &pline); - result.FromString(pline, 10, &pline); - int carry = read_uint(); + read_uint(a); + read_uint(b); + read_uint(result); + + uuint carry; + read_uint(carry); std::cerr << '[' << row << "] Add<" << type_size << ">: "; @@ -164,11 +211,14 @@ void UIntTest::test_addint() if( !check_minmax_bits_bitperint(type_size) ) return; - a.FromString(pline, 10, &pline); - uuint b = read_uint(); - uuint index = read_uint(); - result.FromString(pline, 10, &pline); - int carry = read_uint(); + uuint b, index, carry; + + read_uint(a); + read_uint(b); + read_uint(index); + read_uint(result); + + read_uint(carry); std::cerr << '[' << row << "] AddInt<" << type_size << ">: "; @@ -182,6 +232,44 @@ void UIntTest::test_addint() std::cerr << "ok" << std::endl; } +template +void UIntTest::test_addtwoints() +{ + UInt a, result, new_result; + + if( !check_minmax_bits_bitperint(type_size) ) + return; + + std::cerr << '[' << row << "] AddTwoInts<" << type_size << ">: "; + + uuint b, c, index, carry; + + read_uint(a); + read_uint(b); + read_uint(c); + read_uint(index); + read_uint(result); + + read_uint(carry); + + + if( !check_end() ) + return; + + if( index >= type_size - 1 ) + { + std::cerr << "index too large" << std::endl; + return; + } + + + new_result = a; + int new_carry = new_result.AddTwoInts(b, c, index); + + if( check_result_or_carry(result, new_result, carry, new_carry) ) + std::cerr << "ok" << std::endl; +} + int UIntTest::upper_char(int c) { @@ -242,6 +330,7 @@ return true; } + void UIntTest::test_method() { const char * p = pline; @@ -272,6 +361,19 @@ const char * p = pline; pline = p; test_addint<9>(); } else + if( method == "ADDTWOINTS" ) + { + pline = p; test_addtwoints<1>(); + pline = p; test_addtwoints<2>(); + pline = p; test_addtwoints<3>(); + pline = p; test_addtwoints<4>(); + pline = p; test_addtwoints<5>(); + pline = p; test_addtwoints<6>(); + pline = p; test_addtwoints<7>(); + pline = p; test_addtwoints<8>(); + pline = p; test_addtwoints<9>(); + } + else { std::cerr << '[' << row << "] "; std::cerr << "method " << method << " is not supported" << std::endl; diff --git a/tests/uinttest.h b/tests/uinttest.h index 6947180..b8fe3ef 100644 --- a/tests/uinttest.h +++ b/tests/uinttest.h @@ -71,12 +71,21 @@ public: void go(); +bool read_uint(uuint & result); + +template +bool read_uint(UInt & result); + + template void test_add(); template void test_addint(); + template void test_addtwoints(); template bool check_result_carry(const ttmath::UInt & result, const ttmath::UInt & new_result, int carry, int new_carry); + template bool check_result_or_carry(const ttmath::UInt & result, const ttmath::UInt & new_result, + int carry, int new_carry); int upper_char(int c); bool is_white(int c); @@ -84,7 +93,7 @@ void skip_white_characters(); bool read_method(); void test_method(); bool check_line(); -uuint read_uint(); + bool check_minmax_bits(int type_size); bool check_minmax_bits_bitperint(int type_size); bool check_end(); diff --git a/ttmath/ttmathuint.h b/ttmath/ttmathuint.h index f12d87a..5a4e363 100644 --- a/ttmath/ttmathuint.h +++ b/ttmath/ttmathuint.h @@ -3119,12 +3119,15 @@ public: "12foo" will be translated to 12 too existing first white characters will be ommited + + if the value from s is too large the rest digits will be skipped */ uint FromString(const char * s, uint b = 10, const char ** after_source = 0) { UInt base( b ); UInt temp; sint z; + uint c = 0; SetZero(); temp.SetZero(); @@ -3136,23 +3139,23 @@ public: if( b<2 || b>16 ) return 1; + for( ; (z=CharToDigit(*s, b)) != -1 ; ++s) { - temp.table[0] = z; - - if( Mul(base) || Add(temp) ) // first is called Mul() and next Add() + if( c == 0 ) { - if( after_source ) - *after_source = s; + temp.table[0] = z; - return 1; + c += Mul(base); + c += Add(temp); } } if( after_source ) *after_source = s; - return 0; + + return (c==0)? 0 : 1; }