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

ICU-8167 minor formatting

Browse Source 
X-SVN-Rev: 29361
This commit is contained in:
Mark Davis 2011-01-25 19:44:06 +00:00
parent a2e6470823
commit c1ceb846a6
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Timer.java
View File

@ -54,6 +54,14 @@ public final class Timer {
return this;
}
public DecimalFormat getNumberFormat() {
return nf;
}
public DecimalFormat getPercentFormat() {
return pf;
}
public String toString() {
return nf.format(getDuration()) + "\tns";
}
@ -68,9 +76,10 @@ public final class Timer {
return nf.format(getDuration()/iterations) + "\tns\t" + pf.format((double)getDuration()/other - 1D) + "";
}
private static DecimalFormat nf = (DecimalFormat) NumberFormat.getNumberInstance(ULocale.ENGLISH);
private static DecimalFormat pf = (DecimalFormat) NumberFormat.getPercentInstance(ULocale.ENGLISH);
static {
private DecimalFormat nf = (DecimalFormat) NumberFormat.getNumberInstance(ULocale.ENGLISH);
private DecimalFormat pf = (DecimalFormat) NumberFormat.getPercentInstance(ULocale.ENGLISH);
{
pf.setMaximumFractionDigits(1);
pf.setPositivePrefix("+");
}

22
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java
View File

@ -25,7 +25,6 @@ import com.ibm.icu.impl.Utility;
import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.lang.UScript;
import com.ibm.icu.text.DecimalFormat;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.util.ULocale;
@ -34,11 +33,15 @@ public class TrieMapTest extends TestFmwk {
static final boolean HACK_TO_MAKE_TESTS_PASS = false;
static final int MASK = 0x3;
Map<String, Integer> unicodeTestMap = new HashMap<String, Integer>();
boolean useSmallList = true;
int REPEAT = 10;
private Map<String, Integer> unicodeTestMap = new HashMap<String, Integer>();
private boolean useSmallList = true;
Timer t = new Timer();
private Timer t = new Timer();
private DecimalFormat nf = t.getNumberFormat();
private DecimalFormat pf = t.getPercentFormat();
{
pf.setMaximumFractionDigits(0);
}
@Override
protected void init() throws Exception {
@ -166,7 +169,7 @@ public class TrieMapTest extends TestFmwk {
}
}, null, map);
if (comparisonTime == 0) {
logln("\titeration time\tTREEMAP\tn/a\t" + t.toString(testMap.size()) + "\titerations=" + t.getIterations());
logln("\titeration time\tTREEMAP\tn/a\t" + t.toString(testMap.size()) + "\t\titerations=" + t.getIterations());
} else {
logln("\titeration time\tHASHMAP\tn/a\t" + t.toString(testMap.size(), comparisonTime) + "\titerations=" + t.getIterations());
}
@ -297,7 +300,7 @@ public class TrieMapTest extends TestFmwk {
}
}
}, null, testmap);
logln("\tbuild time\tTREEMAP\tn/a\t" + t.toString(testmap.size()) + "\titerations=" + t.getIterations());
logln("\tbuild time\tTREEMAP\tn/a\t" + t.toString(testmap.size()) + "\t\titerations=" + t.getIterations());
return mapTime;
} else {
long mapTime = t.timeIterations(new MyLoop() {
@ -363,9 +366,6 @@ public class TrieMapTest extends TestFmwk {
}
}
private static DecimalFormat nf = (DecimalFormat) NumberFormat.getNumberInstance(ULocale.ENGLISH);
private static DecimalFormat pf = (DecimalFormat) NumberFormat.getPercentInstance(ULocale.ENGLISH);
public void TestTimeGet() {
HashSet<String> keySet = new HashSet<String>(unicodeTestMap.keySet());
ULocale[] locales = ULocale.getAvailableLocales();
@ -414,7 +414,7 @@ public class TrieMapTest extends TestFmwk {
}
}, keys, map);
if (comparisonTime == 0) {
logln("\tget() time\tTREEMAP\tn/a\t" + t.toString(keys.size()) + "\titerations=" + t.getIterations());
logln("\tget() time\tTREEMAP\tn/a\t" + t.toString(keys.size()) + "\t\titerations=" + t.getIterations());
} else {
logln("\tget() time\tHASHMAP\tn/a\t" + t.toString(keys.size(), comparisonTime) + "\titerations=" + t.getIterations());
}