cleaning up, adapted apit-test

Author: kosloot

demos/api_test5.cxx

@@ -37,7 +37,7 @@ int main(){
                                           "test5" );
   My_Experiment->Learn( "dimin.train" );
   {
-    string line =  "=,=,=,=,+,k,e,=,-,r,@,l,T";
+    icu::UnicodeString line =  "=,=,=,=,+,k,e,=,-,r,@,l,T";
     const neighborSet *neighbours1 = My_Experiment->classifyNS( line );
     if ( neighbours1 ){
       cout << "Classify OK on " << line << endl;

include/timbl/TimblAPI.h

@@ -97,9 +97,13 @@ namespace Timbl{
     const TargetValue *Classify( const icu::UnicodeString&,
 				 const ValueDistribution *&,
 				 double& );
-    const neighborSet *classifyNS( const std::string& );
-    bool classifyNS( const std::string&,
+    const neighborSet *classifyNS( const icu::UnicodeString& );
+    bool classifyNS( const icu::UnicodeString&,
 		     neighborSet& );
+    bool classifyNS( const std::string& in,
+		     neighborSet& st ){
+      return classifyNS( TiCC::UnicodeFromUTF8(in), st );
+    }
     const Instance *lastHandledInstance() const;
     const Target *myTargets() const;
     bool Classify( const std::string&,

include/timbl/TimblExperiment.h

@@ -233,7 +233,7 @@ namespace Timbl {
       return classifyString( Line, di );
     }
 
-    const neighborSet *NB_Classify( const std::string& );
+    const neighborSet *NB_Classify( const icu::UnicodeString& );
 
     virtual void initExperiment( bool = false );
 

src/TimblAPI.cxx

@@ -480,15 +480,16 @@ namespace Timbl {
     return NULL;
   }
 
-  const neighborSet *TimblAPI::classifyNS( const string& s ){
+  const neighborSet *TimblAPI::classifyNS( const icu::UnicodeString& s ){
     const neighborSet *ns = 0;
     if ( Valid() ){
       ns = pimpl->NB_Classify( s );
     }
     return ns;
   }
 
-  bool TimblAPI::classifyNS( const string& s, neighborSet& ns ){
+  bool TimblAPI::classifyNS( const icu::UnicodeString& s,
+			     neighborSet& ns ){
     const neighborSet *b = classifyNS( s );
     if ( b != 0 ){
       ns = *b;

src/TimblExperiment.cxx

@@ -1737,11 +1737,10 @@ namespace Timbl {
     return BestT;
   }
 
-  const neighborSet *TimblExperiment::NB_Classify( const string& _line ){
+  const neighborSet *TimblExperiment::NB_Classify( const UnicodeString& line ){
     initExperiment();
-    UnicodeString Line = TiCC::UnicodeFromUTF8(_line);
-    if ( checkLine( Line ) &&
-	 chopLine( Line ) ){
+    if ( checkLine( line ) &&
+	 chopLine( line ) ){
       chopped_to_instance( TestWords );
       return LocalClassify( CurrInst );
     }