Changeset ac7d970 for app/src/lib

Timestamp:

04/08/08 13:53:51 (17 years ago)

Author:

pawelk <pawelk@…>

Branches:

master, help

Children:

0214596

Parents:

317d53b

git-author:

pawelk <pawelk@…> (04/08/08 13:53:51)

git-committer:

pawelk <pawelk@…> (04/08/08 13:53:51)

Message:

Uaktualnilismy kora.

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

Location:

app/src/lib

Files:

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

app/src/lib/word.cc

@@ -23 +23 @@
 
 //---------------------------------------------------------------------------
-int Word::cmp_w(Word a, Word b) {
+bool Word::cmp_w(Word a, Word b) {
   return (a.w_suf() > b.w_suf());
 }
@@ -124 +124 @@
     tab.resize(tab.size()*2);
   
-  tab[cnt].form(fo);
-  tab[cnt].w_suf(0.0);
+
+  Word o;
+  o.form(fo);
+  o.w_suf(0.0);
+  tab.push_back(o);
+//  tab[cnt].form(fo);
+//  tab[cnt].w_suf(0.0);
+
 
   //  if(cnt<MAX-1) {
@@ -132 +138 @@
     tab[cnt]->w_suf(0.0);
     tab[cnt]->w_pref(0.0);*/
+    return cnt++;
+    //  }
+    //return -1;
+}
+
+//---------------------------------------------------------------------------
+
+ //TYMCZASOWO TAK(DLA CORA)
+int Words::add(const char* fo, float weight)
+{
+  int i = find(fo);
+  if(i!=-1) {
+    return i;
+  }
+  
+  if (cnt>=tab.capacity()-1)
+    tab.resize(tab.size()*2);
+  
+  Word o;
+  o.form(fo);
+  o.w_suf(weight);
+  tab.push_back(o);
+//  tab[cnt].form(fo);
+//  tab[cnt].w_suf(weight);
+  
     return cnt++;
     //  }

app/src/lib/word.h

@@ -12 +12 @@
 
 using namespace std;
+
+
 
 class Word
@@ -37 +39 @@
   //  float _w_pref;
 public:
-  static int cmp_w(Word a, Word b);
+  static bool cmp_w(Word a, Word b);
 
   Word() : _len_suf(-1) { *f='\0'; returned=0; };
@@ -76 +78 @@
 
 };
+
 
 inline Word::Word(const Word& word)
@@ -119 +122 @@
   void clear() { cnt=0; tab.clear(); }
   int add(const char* fo);
+  int add(const char* fo, float weight);
   int add(const char* fo, const char* des);