AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2550 make round-trip test 80% faster

Browse Source 
X-SVN-Rev: 10558
This commit is contained in:
Alan Liu 2002-12-09 17:12:26 +00:00
parent 82d82c5e69
commit 015b52208a
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java
View File

@ -5,8 +5,8 @@
******************************************************************************* *******************************************************************************
* *
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java,v $ * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java,v $
* $Date: 2002/12/09 16:39:58 $ * $Date: 2002/12/09 17:12:26 $
* $Revision: 1.48 $ * $Revision: 1.49 $
* *
******************************************************************************* *******************************************************************************
*/ */
@ -72,6 +72,10 @@ public class RoundTripTest extends TestFmwk {
abbreviated = false; abbreviated = false;
} }
public void reset(UnicodeSet newSet) {
reset(newSet, false);
}
public void reset(UnicodeSet newSet, boolean abb) { public void reset(UnicodeSet newSet, boolean abb) {
reset(newSet, abb, 100); reset(newSet, abb, 100);
} }
@ -79,12 +83,10 @@ public class RoundTripTest extends TestFmwk {
public void reset(UnicodeSet newSet, boolean abb, int density) { public void reset(UnicodeSet newSet, boolean abb, int density) {
super.reset(newSet); super.reset(newSet);
abbreviated = abb; abbreviated = abb;
// TODO: Get this working perRange = newSet.getRangeCount();
// perRange = newSet.getRangeCount(); if (perRange != 0) {
// if (perRange != 0) { perRange = density / perRange;
// perRange = density / perRange; }
// }
perRange = 50;
} }
protected void loadRange(int myRange) { protected void loadRange(int myRange) {
@ -143,7 +145,8 @@ public class RoundTripTest extends TestFmwk {
public void TestHangul() throws IOException, ParseException { public void TestHangul() throws IOException, ParseException {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Test t = new Test("Latin-Hangul"); Test t = new Test("Latin-Hangul", 5);
if (getInclusion() < 10) t.setPairLimit(1000);
t.test("[a-zA-Z]", "[\uAC00-\uD7A4]", "", this, new Legal()); t.test("[a-zA-Z]", "[\uAC00-\uD7A4]", "", this, new Legal());
showElapsed(start, "TestHangul"); showElapsed(start, "TestHangul");
} }
@ -155,7 +158,7 @@ public class RoundTripTest extends TestFmwk {
public void TestGreek() throws IOException, ParseException { public void TestGreek() throws IOException, ParseException {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
new Test("Latin-Greek") new Test("Latin-Greek", 50)
.test("[a-zA-Z]", "[\u003B\u00B7[:Greek:]-[\u03D7-\u03EF]]", .test("[a-zA-Z]", "[\u003B\u00B7[:Greek:]-[\u03D7-\u03EF]]",
"[\u00B5\u037A\u03D0-\u03F5]", /* roundtrip exclusions */ "[\u00B5\u037A\u03D0-\u03F5]", /* roundtrip exclusions */
this, new LegalGreek(true)); this, new LegalGreek(true));
@ -275,7 +278,7 @@ public class RoundTripTest extends TestFmwk {
public void TestDevanagariLatin() throws IOException, ParseException { public void TestDevanagariLatin() throws IOException, ParseException {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
new Test("Latin-DEVANAGARI") new Test("Latin-DEVANAGARI", 50)
.test(latinForIndic, "[[:Devanagari:][\u094d][\u0964\u0965]]", "[\u0965]", this, new LegalIndic()); .test(latinForIndic, "[[:Devanagari:][\u094d][\u0964\u0965]]", "[\u0965]", this, new LegalIndic());
showElapsed(start, "TestDevanagariLatin"); showElapsed(start, "TestDevanagariLatin");
} }
@ -642,7 +645,7 @@ public class RoundTripTest extends TestFmwk {
} }
for(int i=0; i<num;i++){ for(int i=0; i<num;i++){
logln("Testing " + array[i][0] + " at index " + i ); logln("Testing " + array[i][0] + " at index " + i );
new Test(array[i][0]) new Test(array[i][0], 50)
.test(array[i][1], array[i][2], .test(array[i][1], array[i][2],
array[i][3], array[i][3],
this, new LegalIndic()); this, new LegalIndic());
@ -830,6 +833,7 @@ public class RoundTripTest extends TestFmwk {
private int errorLimit = 500; private int errorLimit = 500;
private int errorCount = 0; private int errorCount = 0;
private int pairLimit = 0x10000; private int pairLimit = 0x10000;
private int density = 100;
UnicodeSet sourceRange; UnicodeSet sourceRange;
UnicodeSet targetRange; UnicodeSet targetRange;
UnicodeSet toSource; UnicodeSet toSource;
@ -844,7 +848,12 @@ public class RoundTripTest extends TestFmwk {
* create a test for the given script transliterator. * create a test for the given script transliterator.
*/ */
Test(String transliteratorID) { Test(String transliteratorID) {
this(transliteratorID, 100);
}
Test(String transliteratorID, int dens) {
this.transliteratorID = transliteratorID; this.transliteratorID = transliteratorID;
this.density = dens;
} }
public void setErrorLimit(int limit) { public void setErrorLimit(int limit) {
@ -1109,7 +1118,7 @@ public class RoundTripTest extends TestFmwk {
boolean quickRt = log.getInclusion() < 10; boolean quickRt = log.getInclusion() < 10;
usi.reset(sourceRangeMinusFailures, quickRt); usi.reset(sourceRangeMinusFailures, quickRt, density);
while (usi.next()) { while (usi.next()) {
int c = usi.codepoint; int c = usi.codepoint;
@ -1120,7 +1129,7 @@ public class RoundTripTest extends TestFmwk {
!sourceRange.contains(d)) continue; !sourceRange.contains(d)) continue;
if (failSourceTarg.get(d)) continue; if (failSourceTarg.get(d)) continue;
*/ */
usi2.reset(sourceRangeMinusFailures, quickRt); usi2.reset(sourceRangeMinusFailures, quickRt, density);
while (usi2.next()) { while (usi2.next()) {
int d = usi2.codepoint; int d = usi2.codepoint;
@ -1206,7 +1215,7 @@ public class RoundTripTest extends TestFmwk {
!targetRange.contains(c)) continue; !targetRange.contains(c)) continue;
*/ */
usi.reset(targetRangeMinusFailures, quickRt); usi.reset(targetRangeMinusFailures, quickRt, density);
while (usi.next()) { while (usi.next()) {
int c = usi.codepoint; int c = usi.codepoint;
@ -1221,7 +1230,7 @@ public class RoundTripTest extends TestFmwk {
if (TestUtility.isUnassigned(d) || if (TestUtility.isUnassigned(d) ||
!targetRange.contains(d)) continue; !targetRange.contains(d)) continue;
*/ */
usi2.reset(targetRangeMinusFailures, quickRt); usi2.reset(targetRangeMinusFailures, quickRt, density);
while (usi2.next()) { while (usi2.next()) {
int d = usi2.codepoint; int d = usi2.codepoint;