- wyrzucenie niepotrzebnych metod (hasHomonym i toString) z klasy MorphInterpretation

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@248 ff4e3ee1-f430-4e82-ade0-24591c43f1fd

- wyrzucenie niepotrzebnych metod (hasHomonym i toString) z klasy MorphInterpretation
git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@248 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Michał Lenart
1 parent 0d48140d
Showing 3 changed files with 17 additions and 43 deletions
morfeusz/MorphInterpretation.cpp
morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Generator.cpp
morfeusz/morfeusz2.h
@@ -45,40 +45,4 @@ namespace morfeusz {
         return mi;
     }
  
-    static inline bool hasEnding(const string &fullString, const string &ending) {
-        if (fullString.length() >= ending.length()) {
-            return (0 == fullString.compare(fullString.length() - ending.length(), ending.length(), ending));
-        }
-        else {
-            return false;
-        }
-    }
-
-    bool MorphInterpretation::hasHomonym(const string& homonymId) const {
-        size_t homonymSeparatorIdx = this->lemma.length() - homonymId.length() - 1;
-        return homonymSeparatorIdx > 0
-                && this->lemma[homonymSeparatorIdx] == HOMONYM_SEPARATOR
-                && hasEnding(this->lemma, homonymId);
-    }
-
-    std::string MorphInterpretation::toString(bool includeNodeNumbers) const {
-        std::stringstream res;
-        if (includeNodeNumbers) {
-            res << startNode << "," << endNode << ",";
-        }
-        res << orth << ",";
-
-        res << lemma;
-        res << ",";
-
-        //        res << getTag();
-        //        if (!getName().empty()) {
-        //            res << "," << getName();
-        //        }
-        //        if (!getQualifiers().empty()) {
-        //            res << "," << getQualifiersStr(*this);
-        //        }
-        return res.str();
-    }
-
 }
@@ -12,6 +12,22 @@
 using namespace std;
  
 namespace morfeusz {
+    
+    static bool hasEnding(const string &fullString, const string &ending) {
+        if (fullString.length() >= ending.length()) {
+            return (0 == fullString.compare(fullString.length() - ending.length(), ending.length(), ending));
+        }
+        else {
+            return false;
+        }
+    }
+    
+    static bool hasHomonym(const MorphInterpretation& mi, const string& homonymId) {
+        size_t homonymSeparatorIdx = mi.lemma.length() - homonymId.length() - 1;
+        return homonymSeparatorIdx > 0
+                && mi.lemma[homonymSeparatorIdx] == HOMONYM_SEPARATOR
+                && hasEnding(mi.lemma, homonymId);
+    }
  
     InterpretedChunksDecoder4Generator::InterpretedChunksDecoder4Generator(const Environment& env) : InterpretedChunksDecoder(env) {
     }
@@ -31,7 +47,7 @@ namespace morfeusz {
             MorphInterpretation mi = this->decodeMorphInterpretation(startNode, endNode, orthPrefix, lemma, interpretedChunk, currPtr);
             //                        cerr << mi.toString(false) << endl;
             //            cerr << "required='" << interpretedChunk.requiredHomonymId << "' morphInterp='" << mi.getHomonymId() << "'" << endl;
-            if (interpretedChunk.requiredHomonymId.empty() || mi.hasHomonym(interpretedChunk.requiredHomonymId)) {
+            if (interpretedChunk.requiredHomonymId.empty() || hasHomonym(mi, interpretedChunk.requiredHomonymId)) {
                 out.push_back(mi);
             }
         }
@@ -358,12 +358,6 @@ namespace morfeusz {
             return tagId == 1;
         }
  
-        // FIXME - do wyrzucenia gdzie indziej
-        bool hasHomonym(const std::string& homonymId) const;
-
-        // FIXME - do wyrzucenia gdzie indziej
-        std::string toString(bool includeNodeNumbers) const;
-        
         int startNode;
         int endNode;
         std::string orth;