Changeset 1297 for trunk/gsdl/src/mgpp/text

Timestamp:

2000-07-24T14:15:17+12:00 (24 years ago)

Author:

kjm18

Message:

removed BrowseCompare(), added UCArrayVector type

Location:

trunk/gsdl/src/mgpp/text

Files:

• UCArray.cpp (modified) (1 diff)
• UCArray.h (modified) (2 diffs)

trunk/gsdl/src/mgpp/text/UCArray.cpp

@@ -228 +228 @@
 }
 
-/* comparison for browse index - items match if the smaller word
-   is a prefix of the larger word, case independent
-*/
-int BrowseCompare (const UCArray &a1, const UCArray &a2) {
-  unsigned int l1 = a1.size();
-  unsigned int l2 = a2.size();
-  unsigned int l = (l1 < l2) ? l1 : l2; // l is the shorter of the two
-  int diff = 0;
-
-  UCArray::const_iterator a1Here = a1.begin();
-  UCArray::const_iterator a2Here = a2.begin();
-
-  while(l--) {
-    if ((diff = casecharmap[*a1Here] - casecharmap[*a2Here]) !=0)
-      return diff;
-    a1Here++;
-    a2Here++;
-  }
-  return 0;
-
-}
-
 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2) {
   unsigned long l = (a1.size() < a2.size()) ? a1.size() : a2.size();

trunk/gsdl/src/mgpp/text/UCArray.h

@@ -90 +90 @@
 // compares the two strings in dictionary order
 int DictCompare (const UCArray &a1, const UCArray &a2);
-// compares the two strings, case independent, a match (ie 0) is
-// if one string is a prefix of the other
-int BrowseCompare (const UCArray &a1, const UCArray &a2);
 
 struct LTUCArray {
@@ -106 +103 @@
 
 typedef set<UCArray, LTUCArray> UCArraySet;
-
+typedef vector<UCArray> UCArrayVector;
 
 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2);