-/********************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+/***********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2003, International Business Machines Corporation and
- * others. All Rights Reserved.
- ********************************************************************/
+ * Copyright (c) 1997-2015, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ***********************************************************************/
#include "unicode/utypes.h"
#include "unicode/dcfmtsym.h"
#include "unicode/decimfmt.h"
#include "unicode/locid.h"
+#include "putilimp.h"
+#include "cstring.h"
#include <float.h>
#include <stdio.h> // for sprintf
+#include <stdlib.h>
// *****************************************************************************
// class NumberFormatRoundTripTest
UBool NumberFormatRoundTripTest::verbose = FALSE;
UBool NumberFormatRoundTripTest::STRING_COMPARE = TRUE;
UBool NumberFormatRoundTripTest::EXACT_NUMERIC_COMPARE = FALSE;
-UBool NumberFormatRoundTripTest::DEBUG = FALSE;
+UBool NumberFormatRoundTripTest::DEBUG_VAR = FALSE;
double NumberFormatRoundTripTest::MAX_ERROR = 1e-14;
double NumberFormatRoundTripTest::max_numeric_error = 0.0;
double NumberFormatRoundTripTest::min_numeric_error = 1.0;
}
UBool
-NumberFormatRoundTripTest::failure(UErrorCode status, const char* msg)
+NumberFormatRoundTripTest::failure(UErrorCode status, const char* msg, UBool possibleDataError)
{
if(U_FAILURE(status)) {
- errln(UnicodeString("FAIL: ") + msg + " failed, error " + u_errorName(status));
+ if (possibleDataError) {
+ dataerrln(UnicodeString("FAIL: ") + msg + " failed, error " + u_errorName(status));
+ } else {
+ errln(UnicodeString("FAIL: ") + msg + " failed, error " + u_errorName(status));
+ }
return TRUE;
}
return FALSE;
}
+uint32_t
+NumberFormatRoundTripTest::randLong()
+{
+ // Assume 8-bit (or larger) rand values. Also assume
+ // that the system rand() function is very poor, which it always is.
+ uint32_t d;
+ uint32_t i;
+ char* poke = (char*)&d;
+ for (i=0; i < sizeof(uint32_t); ++i)
+ {
+ poke[i] = (char)(rand() & 0xFF);
+ }
+ return d;
+}
+
+/**
+ * Return a random value from -range..+range.
+ */
+double
+NumberFormatRoundTripTest::randomDouble(double range)
+{
+ double a = randFraction();
+ return (2.0 * range * a) - range;
+}
+
void
NumberFormatRoundTripTest::start()
{
logln("Default Locale");
fmt = NumberFormat::createInstance(status);
- failure(status, "NumberFormat::createInstance");
- test(fmt);
+ if (!failure(status, "NumberFormat::createInstance", TRUE)){
+ test(fmt);
+ }
delete fmt;
fmt = NumberFormat::createCurrencyInstance(status);
- failure(status, "NumberFormat::createCurrencyInstance");
- test(fmt);
+ if (!failure(status, "NumberFormat::createCurrencyInstance", TRUE)){
+ test(fmt);
+ }
delete fmt;
fmt = NumberFormat::createPercentInstance(status);
- failure(status, "NumberFormat::createPercentInstance");
- test(fmt);
+ if (!failure(status, "NumberFormat::createPercentInstance", TRUE)){
+ test(fmt);
+ }
delete fmt;
void
NumberFormatRoundTripTest::test(NumberFormat *fmt)
{
-#if IEEE_754 && !defined(OS400)
+#if IEEE_754 && U_PLATFORM != U_PF_OS400
test(fmt, uprv_getNaN());
test(fmt, uprv_getInfinity());
test(fmt, -uprv_getInfinity());
test(fmt, uprv_floor((randomDouble(10000))));
test(fmt, randomDouble(1e50));
test(fmt, randomDouble(1e-50));
-#if !defined(OS390) && !defined(OS400)
+#if !(U_PF_OS390 <= U_PLATFORM && U_PLATFORM <= U_PF_OS400)
test(fmt, randomDouble(1e100));
#elif IEEE_754
- test(fmt, randomDouble(1e75)); /*OS390 and OS400*/
+ test(fmt, randomDouble(1e75));
#endif /* OS390 and OS400 */
// {sfb} When formatting with a percent instance, numbers very close to
// DBL_MAX will fail the round trip. This is because:
// I'll get around this by dividing by the multiplier to make sure
// the double will stay in range.
//if(fmt->getMultipler() == 1)
- if(fmt->getDynamicClassID() == DecimalFormat::getStaticClassID())
+ DecimalFormat *df = dynamic_cast<DecimalFormat *>(fmt);
+ if(df != NULL)
{
-#if !defined(OS390) && !defined(OS400)
+#if !(U_PF_OS390 <= U_PLATFORM && U_PLATFORM <= U_PF_OS400)
/* DBL_MAX/2 is here because randomDouble does a *2 in the math */
- test(fmt, randomDouble(DBL_MAX/2.0) / ((DecimalFormat*)fmt)->getMultiplier());
+ test(fmt, randomDouble(DBL_MAX/2.0) / df->getMultiplier());
#elif IEEE_754
- test(fmt, randomDouble(1e75) / ((DecimalFormat*)fmt)->getMultiplier());
+ test(fmt, randomDouble(1e75) / df->getMultiplier());
#else
- test(fmt, randomDouble(1e65) / ((DecimalFormat*)fmt)->getMultiplier()); /*OS390*/
+ test(fmt, randomDouble(1e65) / df->getMultiplier());
#endif
}
-#if defined XP_MAC || defined __alpha__ || defined U_OSF
-// These machines don't support denormalized doubles,
-// so the low-end range doesn't match Windows
+#if (defined(_MSC_VER) && _MSC_VER < 1400) || defined(__alpha__) || defined(U_OSF)
+ // These machines and compilers don't fully support denormalized doubles,
test(fmt, randomDouble(1e-292));
-#elif defined(OS390) || defined(OS400)
+ test(fmt, randomDouble(1e-100));
+#elif U_PF_OS390 <= U_PLATFORM && U_PLATFORM <= U_PF_OS400
+ // i5/OS (OS/400) throws exceptions on denormalized numbers
# if IEEE_754
- test(fmt, randomDouble(1e-78)); /*OS390 and OS400*/
+ test(fmt, randomDouble(1e-78));
+ test(fmt, randomDouble(1e-78));
+ // #else we're using something like the old z/OS floating point.
# endif
#else
- test(fmt, randomDouble(1e-323));
-#endif /* OS390 and OS400*/
-#if !defined(OS390) && !defined(OS400)
+ // This is a normal machine that can support IEEE754 denormalized doubles without throwing an error.
+ test(fmt, randomDouble(DBL_MIN)); /* Usually 2.2250738585072014e-308 */
test(fmt, randomDouble(1e-100));
-#elif IEEE_754
- test(fmt, randomDouble(1e-78)); /*OS390 and OS400*/
-#endif /* OS390 and OS400*/
+#endif
}
}
-/**
- * Return a random value from -range..+range.
- */
-double
-NumberFormatRoundTripTest::randomDouble(double range)
-{
- double a = randFraction();
- return (2.0 * range * a) - range;
-}
-
void
NumberFormatRoundTripTest::test(NumberFormat *fmt, double value)
{
NumberFormatRoundTripTest::test(NumberFormat *fmt, const Formattable& value)
{
fmt->setMaximumFractionDigits(999);
-
+ DecimalFormat *df = dynamic_cast<DecimalFormat *>(fmt);
+ if(df != NULL) {
+ df->setRoundingIncrement(0.0);
+ }
UErrorCode status = U_ZERO_ERROR;
UnicodeString s, s2, temp;
if(isDouble(value))
Formattable n;
UBool show = verbose;
- if(DEBUG)
+ if(DEBUG_VAR)
logln(/*value.getString(temp) +*/ " F> " + escape(s));
fmt->parse(s, n, status);
failure(status, "fmt->parse");
- if(DEBUG)
+ if(DEBUG_VAR)
logln(escape(s) + " P> " /*+ n.getString(temp)*/);
if(isDouble(n))
else
s2 = fmt->format(n.getLong(), s2);
- if(DEBUG)
+ if(DEBUG_VAR)
logln(/*n.getString(temp) +*/ " F> " + escape(s2));
if(STRING_COMPARE) {
if (show) {
errln(/*value.getString(temp) +*/ typeOf(value, temp) + " F> " +
- escape(s) + " P> " +
- /*n.getString(temp) +*/ typeOf(n, temp) + " F> " +
+ escape(s) + " P> " + (n.getType() == Formattable::kDouble ? n.getDouble() : (double)n.getLong())
+ /*n.getString(temp) */ + typeOf(n, temp) + " F> " +
escape(s2));
}
}
UnicodeString copy(s);
s.remove();
for(int i = 0; i < copy.length(); ++i) {
- UChar c = copy[i];
- if(c < 0x00FF)
+ UChar32 c = copy.char32At(i);
+ if (c >= 0x10000) {
+ ++i;
+ }
+ if(c < 0x00FF) {
s += c;
- else {
+ } else {
s += "+U";
char temp[16];
sprintf(temp, "%4X", c); // might not work
projects / apple / icu.git / blobdiff