--- old/test/java/text/Format/DecimalFormat/GoldenFormattedValues.java 2015-06-04 14:17:12.600483181 -0700 +++ new/test/java/text/Format/DecimalFormat/GoldenFormattedValues.java 2015-06-04 14:17:12.279477895 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ - + /* This is a machine generated file - Please DO NOT EDIT ! * Change RoundingAndPropertyTest instead, * and run with "-gengold" argument to regenerate (without copyright header). @@ -47,27 +47,27 @@ // The formatted values below were generated from golden values // listed in GoldenDoubleValues.java, using the following jvm version : - // Oracle Corporation Java HotSpot(TM) Server VM 1.8.0-ea + // Oracle Corporation Java HotSpot(TM) 64-Bit Server VM 1.9.0-internal-fastdebug // locale for golden double values : en_US // locale for testing digit localization : hi_IN // The array of int[] unicode values storing the expected results // when experiencing full localization of digits on DecimalLocalizationValues. static int[][] DecimalDigitsLocalizedFormattedValues = { - { 2407, 46, 2407, 2408, 2409 }, - { 2407, 2408, 46, 2407, 2408, 2409 }, - { 2407, 2408, 2409, 46, 2407, 2408, 2409 }, - { 2407, 44, 2408, 2409, 2410, 46, 2407, 2408, 2409 }, - { 2407, 2408, 44, 2409, 2410, 2411, 46, 2407, 2408, 2409 }, - { 2407, 2408, 2409, 44, 2410, 2411, 2412, 46, 2407, 2408, 2409 }, - { 2407, 44, 2408, 2409, 2410, 44, 2411, 2412, 2413, 46, 2407, 2408, 2409 }, - { 2407, 2408, 44, 2409, 2410, 2411, 44, 2412, 2413, 2414, 46, 2407, 2408, 2409 }, - { 2407, 2408, 2409, 44, 2410, 2411, 2412, 44, 2413, 2414, 2415, 46, 2407, 2408, 2409 }, - { 2407, 44, 2408, 2409, 2410, 44, 2411, 2412, 2413, 44, 2414, 2415, 2406, 46, 2407, 2408, 2409 }, - { 2407, 44, 2408, 2409, 2410 }, - { 2407, 44, 2408, 2409, 2410, 46, 2415 }, - { 2407, 44, 2408, 2409, 2410, 46, 2415, 2415 }, - { 2407, 44, 2408, 2409, 2410, 46, 2415, 2415, 2415 }, + { 49, 46, 49, 50, 51 }, + { 49, 50, 46, 49, 50, 51 }, + { 49, 50, 51, 46, 49, 50, 51 }, + { 49, 44, 50, 51, 52, 46, 49, 50, 51 }, + { 49, 50, 44, 51, 52, 53, 46, 49, 50, 51 }, + { 49, 50, 51, 44, 52, 53, 54, 46, 49, 50, 51 }, + { 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 49, 50, 51 }, + { 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 49, 50, 51 }, + { 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 49, 50, 51 }, + { 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 49, 50, 51 }, + { 49, 44, 50, 51, 52 }, + { 49, 44, 50, 51, 52, 46, 57 }, + { 49, 44, 50, 51, 52, 46, 57, 57 }, + { 49, 44, 50, 51, 52, 46, 57, 57, 57 }, }; // The array of int[] unicode values storing the expected results @@ -83,7 +83,7 @@ { 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 56 }, { 45, 49, 44, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 57 }, { 50, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48 }, - { 65533 }, + { 78, 97, 78 }, { 8734 }, { 45, 8734 }, { 49, 55, 57, 44, 55, 54, 57, 44, 51, 49, 51, 44, 52, 56, 54, 44, 50, 51, 49, 44, 53, 55, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48 }, @@ -482,22 +482,22 @@ // when calling Decimal.format(double) on the currency GoldenDoubleValues. static int[][] CurrencyGoldenFormattedValues = { { 36, 48, 46, 48, 48 }, - { 40, 36, 48, 46, 48, 48, 41 }, + { 45, 36, 48, 46, 48, 48 }, { 36, 48, 46, 48, 48 }, { 36, 48, 46, 48, 48 }, - { 40, 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 54, 46, 50, 51, 41 }, + { 45, 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 54, 46, 50, 51 }, { 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 54, 46, 50, 51 }, - { 40, 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 56, 46, 48, 48, 41 }, + { 45, 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 56, 46, 48, 48 }, { 36, 50, 44, 49, 52, 55, 44, 52, 56, 51, 44, 54, 52, 56, 46, 48, 48 }, - { 40, 36, 49, 44, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, + { 45, 36, 49, 44, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, { 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, - { 65533 }, + { 78, 97, 78 }, { 36, 8734 }, - { 40, 36, 8734, 41 }, + { 45, 36, 8734 }, { 36, 49, 55, 57, 44, 55, 54, 57, 44, 51, 49, 51, 44, 52, 56, 54, 44, 50, 51, 49, 44, 53, 55, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, - { 40, 36, 57, 44, 56, 55, 54, 44, 53, 52, 51, 44, 50, 49, 48, 46, 57, 57, 41 }, + { 45, 36, 57, 44, 56, 55, 54, 44, 53, 52, 51, 44, 50, 49, 48, 46, 57, 57 }, { 36, 57, 44, 56, 55, 54, 44, 53, 52, 51, 44, 50, 49, 48, 46, 57, 57 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 44, 48, 49, 50, 44, 51, 52, 53, 44, 54, 55, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 44, 48, 49, 50, 44, 51, 52, 53, 44, 54, 55, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 44, 48, 49, 50, 44, 51, 52, 53, 44, 54, 55, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 49, 46, 49, 50 }, { 36, 49, 50, 46, 49, 50 }, @@ -509,16 +509,16 @@ { 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 49, 50 }, { 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 49, 50 }, { 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 49, 50 }, - { 40, 36, 49, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 51, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 49, 50, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 49, 50, 41 }, + { 45, 36, 49, 46, 49, 50 }, + { 45, 36, 49, 50, 46, 49, 50 }, + { 45, 36, 49, 50, 51, 46, 49, 50 }, + { 45, 36, 49, 44, 50, 51, 52, 46, 49, 50 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 46, 49, 50 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 46, 49, 50 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 49, 50 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 49, 50 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 49, 50 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 49, 50 }, { 36, 48, 46, 49, 48 }, { 36, 48, 46, 49, 50 }, { 36, 48, 46, 49, 50 }, @@ -549,36 +549,36 @@ { 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, { 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, { 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, - { 40, 36, 48, 46, 49, 48, 41 }, - { 40, 36, 48, 46, 49, 50, 41 }, - { 40, 36, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50, 41 }, + { 45, 36, 48, 46, 49, 48 }, + { 45, 36, 48, 46, 49, 50 }, + { 45, 36, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 49, 50 }, { 36, 49, 46, 57, 57 }, { 36, 49, 50, 46, 57, 57 }, { 36, 49, 50, 51, 46, 57, 57 }, @@ -599,26 +599,26 @@ { 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 57, 46, 48, 48 }, { 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 57, 48, 46, 48, 48 }, { 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 49, 46, 48, 48 }, - { 40, 36, 49, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 51, 46, 57, 57, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 46, 57, 57, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 57, 57, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 57, 57, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 57, 57, 41 }, - { 40, 36, 50, 46, 48, 48, 41 }, - { 40, 36, 49, 51, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 52, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 53, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 54, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 55, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 56, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 57, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 57, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 49, 46, 48, 48, 41 }, + { 45, 36, 49, 46, 57, 57 }, + { 45, 36, 49, 50, 46, 57, 57 }, + { 45, 36, 49, 50, 51, 46, 57, 57 }, + { 45, 36, 49, 44, 50, 51, 52, 46, 57, 57 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 46, 57, 57 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 46, 57, 57 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 57, 57 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 57, 57 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 57, 57 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 57, 57 }, + { 45, 36, 50, 46, 48, 48 }, + { 45, 36, 49, 51, 46, 48, 48 }, + { 45, 36, 49, 50, 52, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 53, 46, 48, 48 }, + { 45, 36, 49, 50, 44, 51, 52, 54, 46, 48, 48 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 55, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 56, 46, 48, 48 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 57, 46, 48, 48 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 57, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 49, 46, 48, 48 }, { 36, 49, 49, 48, 46, 48, 48 }, { 36, 49, 44, 49, 48, 48, 46, 48, 48 }, { 36, 49, 49, 44, 48, 48, 48, 46, 48, 48 }, @@ -627,14 +627,14 @@ { 36, 49, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 49, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 49, 44, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, - { 40, 36, 49, 49, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 49, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 49, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 49, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 49, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, + { 45, 36, 49, 49, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 49, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 49, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 49, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 49, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 50, 46, 48, 48 }, { 36, 50, 48, 46, 48, 48 }, { 36, 50, 48, 48, 46, 48, 48 }, @@ -645,16 +645,16 @@ { 36, 50, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 50, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, - { 40, 36, 50, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, + { 45, 36, 50, 46, 48, 48 }, + { 45, 36, 50, 48, 46, 48, 48 }, + { 45, 36, 50, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 50, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, { 36, 49, 48, 46, 48, 48 }, { 36, 49, 48, 48, 46, 48, 48 }, { 36, 49, 44, 48, 48, 48, 46, 48, 48 }, @@ -673,24 +673,24 @@ { 36, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, { 36, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, { 36, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, - { 40, 36, 49, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48, 41 }, - { 40, 36, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, - { 40, 36, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57, 41 }, + { 45, 36, 49, 48, 46, 48, 48 }, + { 45, 36, 49, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 49, 44, 48, 48, 48, 44, 48, 48, 48, 44, 48, 48, 48, 46, 48, 48 }, + { 45, 36, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 44, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, + { 45, 36, 57, 57, 57, 44, 57, 57, 57, 44, 57, 57, 57, 46, 57, 57 }, { 36, 49, 46, 48, 48 }, { 36, 49, 50, 46, 48, 48 }, { 36, 49, 50, 51, 46, 48, 48 }, @@ -701,19 +701,19 @@ { 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 48, 48 }, { 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 48, 48 }, { 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 48, 48 }, - { 40, 36, 49, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 51, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 48, 48, 41 }, - { 40, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 48, 48, 41 }, - { 40, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 48, 48, 41 }, - { 40, 36, 50, 44, 53, 57, 57, 46, 52, 48, 41 }, - { 40, 36, 50, 44, 53, 57, 57, 46, 51, 52, 41 }, - { 40, 36, 50, 44, 53, 57, 57, 46, 51, 51, 41 }, + { 45, 36, 49, 46, 48, 48 }, + { 45, 36, 49, 50, 46, 48, 48 }, + { 45, 36, 49, 50, 51, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 52, 46, 48, 48 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 46, 48, 48 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 46, 48, 48 }, + { 45, 36, 49, 50, 44, 51, 52, 53, 44, 54, 55, 56, 46, 48, 48 }, + { 45, 36, 49, 50, 51, 44, 52, 53, 54, 44, 55, 56, 57, 46, 48, 48 }, + { 45, 36, 49, 44, 50, 51, 52, 44, 53, 54, 55, 44, 56, 57, 48, 46, 48, 48 }, + { 45, 36, 50, 44, 53, 57, 57, 46, 52, 48 }, + { 45, 36, 50, 44, 53, 57, 57, 46, 51, 52 }, + { 45, 36, 50, 44, 53, 57, 57, 46, 51, 51 }, { 36, 49, 46, 48, 48 }, { 36, 49, 46, 48, 48 }, { 36, 49, 46, 48, 48 },