ICU-551.30.tar.gz

[apple/icu.git] / icuSources / test / perf / dicttrieperf / dicttrieperf.cpp

diff --git a/icuSources/test/perf/dicttrieperf/dicttrieperf.cpp b/icuSources/test/perf/dicttrieperf/dicttrieperf.cpp
index f1c13adc84242440ad38475ddd28e35335ad8218..9b3c284c776bd23a4b61ea637a83e664fa723d72 100644 (file)
--- a/icuSources/test/perf/dicttrieperf/dicttrieperf.cpp
+++ b/icuSources/test/perf/dicttrieperf/dicttrieperf.cpp
@@ -1,6 +1,6 @@
 /*  
  **********************************************************************
- *   Copyright (C) 2010-2011, International Business Machines
+ *   Copyright (C) 2010-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *  file name:  dicttrieperf.cpp
@@ -34,12 +34,10 @@
 #include "charstr.h"
 #include "package.h"
 #include "toolutil.h"
-#include "triedict.h"
 #include "ucbuf.h"  // struct ULine
 #include "uoptions.h"
 #include "uvectr32.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+#include "cmemory.h" // for UPRV_LENGTHOF
 
 // Test object.
 class DictionaryTriePerfTest : public UPerfTest {
@@ -337,56 +335,6 @@ protected:
     const DictionaryTriePerfTest &perf;
 };
 
-class CompactTrieDictLookup : public DictLookup {
-public:
-    CompactTrieDictLookup(const DictionaryTriePerfTest &perfTest)
-            : DictLookup(perfTest), ctd(NULL) {
-        IcuToolErrorCode errorCode("UCharsTrieDictLookup()");
-        // U+0E1C is the median code unit, from
-        // the UCharsTrie root node (split-branch node) for thaidict.txt.
-        MutableTrieDictionary builder(0xe1c, errorCode);
-        const ULine *lines=perf.getCachedLines();
-        int32_t numLines=perf.getNumLines();
-        for(int32_t i=0; i<numLines; ++i) {
-            // Skip comment lines (start with a character below 'A').
-            if(lines[i].name[0]<0x41) {
-                continue;
-            }
-            builder.addWord(lines[i].name, lines[i].len, errorCode);
-        }
-        ctd=new CompactTrieDictionary(builder, errorCode);
-        int32_t length=(int32_t)ctd->dataSize();
-        printf("size of CompactTrieDict:    %6ld bytes\n", (long)length);
-    }
-
-    virtual ~CompactTrieDictLookup() {
-        delete ctd;
-    }
-
-    virtual void call(UErrorCode *pErrorCode) {
-        UText text=UTEXT_INITIALIZER;
-        int32_t lengths[20];
-        const ULine *lines=perf.getCachedLines();
-        int32_t numLines=perf.getNumLines();
-        for(int32_t i=0; i<numLines; ++i) {
-            // Skip comment lines (start with a character below 'A').
-            if(lines[i].name[0]<0x41) {
-                continue;
-            }
-            utext_openUChars(&text, lines[i].name, lines[i].len, pErrorCode);
-            int32_t count;
-            ctd->matches(&text, lines[i].len,
-                         lengths, count, LENGTHOF(lengths));
-            if(count==0 || lengths[count-1]!=lines[i].len) {
-                fprintf(stderr, "word %ld (0-based) not found\n", (long)i);
-            }
-        }
-    }
-
-protected:
-    CompactTrieDictionary *ctd;
-};
-
 // Closely imitate CompactTrieDictionary::matches().
 // Note: CompactTrieDictionary::matches() is part of its trie implementation,
 // and while it loops over the text, it knows the current state.
@@ -500,7 +448,7 @@ public:
             utext_openUChars(&text, lines[i].name, lines[i].len, pErrorCode);
             int32_t count=0;
             ucharsTrieMatches(*trie, &text, lines[i].len,
-                              lengths, count, LENGTHOF(lengths));
+                              lengths, count, UPRV_LENGTHOF(lengths));
             if(count==0 || lengths[count-1]!=lines[i].len) {
                 fprintf(stderr, "word %ld (0-based) not found\n", (long)i);
             }
@@ -649,7 +597,7 @@ public:
             utext_openUChars(&text, lines[i].name, lines[i].len, pErrorCode);
             int32_t count=0;
             bytesTrieMatches(*trie, &text, lines[i].len,
-                             lengths, count, LENGTHOF(lengths));
+                             lengths, count, UPRV_LENGTHOF(lengths));
             if(count==0 || lengths[count-1]!=lines[i].len) {
                 fprintf(stderr, "word %ld (0-based) not found\n", (long)i);
             }
@@ -695,30 +643,24 @@ UPerfFunction *DictionaryTriePerfTest::runIndexedTest(int32_t index, UBool exec,
     if(hasFile()) {
         switch(index) {
         case 0:
-            name="compacttriematches";
-            if(exec) {
-                return new CompactTrieDictLookup(*this);
-            }
-            break;
-        case 1:
             name="ucharstriematches";
             if(exec) {
                 return new UCharsTrieDictMatches(*this);
             }
             break;
-        case 2:
+        case 1:
             name="ucharstriecontains";
             if(exec) {
                 return new UCharsTrieDictContains(*this);
             }
             break;
-        case 3:
+        case 2:
             name="bytestriematches";
             if(exec) {
                 return new BytesTrieDictMatches(*this);
             }
             break;
-        case 4:
+        case 3:
             name="bytestriecontains";
             if(exec) {
                 return new BytesTrieDictContains(*this);