Changeset 6ac84d8 for app/src/lib

Timestamp:

05/09/08 12:42:32 (17 years ago)

Author:

obrebski <obrebski@…>

Branches:

master, help

Children:

19760ef

Parents:

3748bd1

git-author:

obrebski <obrebski@…> (05/09/08 12:42:32)

git-committer:

obrebski <obrebski@…> (05/09/08 12:42:32)

Message:

gue wreszcie dziala, tylko nie sortuje wynikow

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@50 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app/src/lib

Files:

• word.cc (modified) (3 diffs)
• word.h (modified) (3 diffs)

app/src/lib/word.cc

@@ -16 +16 @@
   lemd[i]='\0';
   if(isdigit(lemd[0]))
-    fullform(f,lemd,l);  // je¶li lemat zakodowany
+    fullform(f,lemd,l);  // je¶li lemat zakodowany
   else
-    strcpy(l,lemd);     // je¶li lemat w pe³nej postaci
+    strcpy(l,lemd);     // je¶li lemat w pe³nej postaci
   strcpy(d,de+i+1);
 }
@@ -25 +25 @@
 bool Word::cmp_w(Word a, Word b) {
   return (a.w_suf() > b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool Word::cmp_w_rev(Word a, Word b) {
+  return (a.w_suf() < b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool cmp_w_fun(Word a, Word b) {
+  return (a.w_suf() > b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool cmp_w_rev_fun(Word a, Word b) {
+  return (a.w_suf() < b.w_suf());
 }
 //---------------------------------------------------------------------------
@@ -110 +122 @@
 void Words::sort() {
   std::sort(tab.begin(), tab.end(), Word::cmp_w);
+}
+
+//---------------------------------------------------------------------------
+void Words::sort_rev() {
+  std::sort(tab.begin(), tab.end(), cmp_w_rev_fun);
 }
 

app/src/lib/word.h

@@ -40 +40 @@
 public:
   static bool cmp_w(Word a, Word b);
+  static bool cmp_w_rev(Word a, Word b);
 
   Word() : _len_suf(-1) { *f='\0'; returned=0; };
@@ -104 +105 @@
 
 //---------------------------------------------------------------------------
+
+
+
+
+bool cmp_w_fun(Word a, Word b);
+bool cmp_w_rev_fun(Word a, Word b);
+
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -133 +142 @@
 
   void sort();
+  void sort_rev();
 
   void prn(ostream& os);