merge bug fix by gcniu

Discovery666 · Sep 27, 2013 · 02ab8a0 · 02ab8a0
1 parent 4b53795
commit 02ab8a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
@@ -10,7 +10,7 @@
 #if _WIN32
 #include <Windows.h>
 #define sleep Sleep
-#endif	//	end for _WIN32
+#endif  //  end for _WIN32
 
 namespace ltp {
 namespace parser {

diff --git a/src/parser/parser_dll.cpp b/src/parser/parser_dll.cpp
@@ -50,8 +50,9 @@ class ParserWrapper : public ltp::parser::Parser {
 
         ltp::parser::Parser::extract_features(inst);
         ltp::parser::Parser::calculate_score(inst, ltp::parser::Parser::model->param);
-	ltp::parser::Decoder * deco;
-	deco=build_decoder();	
+
+        ltp::parser::Decoder * deco;
+        deco = build_decoder();
         deco->decode(inst);
 
         int len = inst->size();
@@ -64,7 +65,8 @@ class ParserWrapper : public ltp::parser::Parser {
         }
 
         delete inst;
-	delete deco;
+        delete deco;
+
         return inst->size();
     }
 };

diff --git a/src/srl/DepSRL.cpp b/src/srl/DepSRL.cpp
@@ -107,9 +107,7 @@ int DepSRL::GetSRLResult(
         const LTPData     &ltpData,
         const vector<int> &predicates,
         vector< pair< int, vector< pair< string, pair< int, int > > > > > &vecSRLResult,
-	SRLBaselineExt * m_srlBaseline
-        )
-{
+        SRLBaselineExt * m_srlBaseline) {
     vecSRLResult.clear();
 
     if ( !m_resourceLoaded ) {
@@ -155,7 +153,7 @@ int DepSRL::ExtractSrlFeatures(
         const vector<int> &VecAllPredicates,
         VecFeatForSent    &vecAllFeatures,
         VecPosForSent     &vecAllPos,
-	SRLBaselineExt* m_srlBaseline
+        SRLBaselineExt* m_srlBaseline
         )
 {
     vecAllFeatures.clear();
@@ -892,4 +890,3 @@ int DepSRL::RenameArguments(
 
     return 1;
 }
-
diff --git a/src/srl/DepSRL.h b/src/srl/DepSRL.h
@@ -70,10 +70,12 @@ class DepSRL {
                 const LTPData     &ltpData,
                 const vector<int> &predicates,
                 vector< pair< int, vector< pair< string, pair< int, int > > > > > &vecSRLResult,
-		SRLBaselineExt * m_srlBaseline
+                SRLBaselineExt * m_srlBaseline
                 );
-	string GetConfigXml();
-	string GetSelectFeats();
+
+        string GetConfigXml();
+        string GetSelectFeats();
+
     private:
         /* 1.Extract SRL Features from input
          */
@@ -82,7 +84,7 @@ class DepSRL {
                 const vector<int> &VecAllPredicates,
                 VecFeatForSent    &vecAllFeatures,
                 VecPosForSent     &vecAllPos,
-		SRLBaselineExt* m_srlBaseline
+                SRLBaselineExt* m_srlBaseline
                 );
 
         /* 2.Predict with the maxent library
@@ -243,11 +245,11 @@ class DepSRL {
 
     private:
         bool                m_resourceLoaded;
-	string m_configXml;
-	string m_selectFeats;
+
+        string m_configXml;
+        string m_selectFeats;
         maxent::ME_Model    *m_srlModel; // for role labeling
         maxent::ME_Model    *m_prgModel; // for predicate recognition
 };
 
 #endif
-