Merge pull request #55 from duydq12/dev/RB-327_build_pn9_on_win10

refs RB-327: PN9 integration for Windows environment
SYSTRAN · Jan 10, 2023 · f4c1d7f · f4c1d7f
2 parents 3b2f288 + b815402
commit f4c1d7f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cli/src/FuzzyMatch-cli.cc b/cli/src/FuzzyMatch-cli.cc
@@ -312,7 +312,7 @@ int main(int argc, char** argv)
                                                                         "`sep`/`jnr` and/or `pct`.")
     ("idf-penalty,I", po::value(&idf_penalty)->default_value(0), "if not 0, apply idf-penalty on missing tokens")
     ("subseq-idf-weighting,w", po::bool_switch(), "use idf weighting in finding longest subsequence")
-    ("max-tokens-in-pattern", po::value(&max_tokens_in_pattern)->default_value(fuzzy::SuffixArrayIndex::DEFAULT_MAX_TOKENS_IN_PATTERN), "Patterns containing more tokens than this value are ignored")
+    ("max-tokens-in-pattern", po::value(&max_tokens_in_pattern)->default_value(fuzzy::DEFAULT_MAX_TOKENS_IN_PATTERN), "Patterns containing more tokens than this value are ignored")
     ("nthreads,N", po::value(&nthreads)->default_value(4), "number of thread to use for match")
     ;
 

diff --git a/include/fuzzy/fuzzy_match.hh b/include/fuzzy/fuzzy_match.hh
@@ -36,7 +36,7 @@ namespace fuzzy
     };
 
     FuzzyMatch(int pt = penalty_token::pt_none,
-               size_t max_tokens_in_pattern = SuffixArrayIndex::DEFAULT_MAX_TOKENS_IN_PATTERN);
+               size_t max_tokens_in_pattern = DEFAULT_MAX_TOKENS_IN_PATTERN);
     ~FuzzyMatch();
 
     bool add_tm(const std::string& id, const Tokens& norm, bool sort = true);

diff --git a/include/fuzzy/suffix_array_index.hh b/include/fuzzy/suffix_array_index.hh
@@ -12,11 +12,11 @@
 
 namespace fuzzy
 {
+  constexpr size_t DEFAULT_MAX_TOKENS_IN_PATTERN = 300; // if you change this value, update README.md
+
   class SuffixArrayIndex
   {
   public:
-    static const size_t DEFAULT_MAX_TOKENS_IN_PATTERN;
-
     SuffixArrayIndex(size_t max_tokens_in_pattern = DEFAULT_MAX_TOKENS_IN_PATTERN);
 
     const SuffixArray &get_SuffixArray() const;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,7 +9,9 @@ set(FUZZY_SOURCES
   edit_distance.cc
   pattern_coverage.cc
 )
-
+if(MSVC)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
 if (COMMAND create_library)
   create_library(${PROJECT_NAME} SHARED
     ${FUZZY_SOURCES})

diff --git a/src/suffix_array_index.cc b/src/suffix_array_index.cc
@@ -2,8 +2,6 @@
 
 namespace fuzzy
 {
-  const size_t SuffixArrayIndex::DEFAULT_MAX_TOKENS_IN_PATTERN = 300; // if you change this value, update README.md
-
   SuffixArrayIndex::SuffixArrayIndex(size_t max_tokens_in_pattern)
     : _max_tokens_in_pattern(max_tokens_in_pattern)
   {