melisa 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (166) hide show
  1. checksums.yaml +7 -0
  2. data/README.md +53 -4
  3. data/ext/extconf.rb +33 -0
  4. data/ext/marisa-0.2.4/AUTHORS +1 -0
  5. data/ext/marisa-0.2.4/COPYING +32 -0
  6. data/ext/marisa-0.2.4/ChangeLog +0 -0
  7. data/ext/marisa-0.2.4/INSTALL +237 -0
  8. data/ext/marisa-0.2.4/Makefile.am +24 -0
  9. data/ext/marisa-0.2.4/Makefile.in +803 -0
  10. data/ext/marisa-0.2.4/NEWS +0 -0
  11. data/ext/marisa-0.2.4/README +63 -0
  12. data/ext/marisa-0.2.4/aclocal.m4 +976 -0
  13. data/ext/marisa-0.2.4/bindings/Makefile +16 -0
  14. data/ext/{marisa → marisa-0.2.4}/bindings/marisa-swig.cxx +0 -0
  15. data/ext/{marisa → marisa-0.2.4}/bindings/marisa-swig.h +0 -0
  16. data/ext/marisa-0.2.4/bindings/marisa-swig.i +28 -0
  17. data/ext/marisa-0.2.4/bindings/perl/Makefile.PL +7 -0
  18. data/ext/{marisa → marisa-0.2.4}/bindings/perl/marisa-swig.cxx +0 -0
  19. data/ext/{marisa → marisa-0.2.4}/bindings/perl/marisa-swig.h +0 -0
  20. data/ext/{marisa → marisa-0.2.4}/bindings/perl/marisa-swig_wrap.cxx +0 -0
  21. data/ext/marisa-0.2.4/bindings/perl/marisa.pm +297 -0
  22. data/ext/marisa-0.2.4/bindings/perl/sample.dic +0 -0
  23. data/ext/marisa-0.2.4/bindings/perl/sample.pl +62 -0
  24. data/ext/{marisa → marisa-0.2.4}/bindings/python/marisa-swig.cxx +0 -0
  25. data/ext/{marisa → marisa-0.2.4}/bindings/python/marisa-swig.h +0 -0
  26. data/ext/{marisa → marisa-0.2.4}/bindings/python/marisa-swig_wrap.cxx +0 -0
  27. data/ext/marisa-0.2.4/bindings/python/marisa.py +206 -0
  28. data/ext/marisa-0.2.4/bindings/python/sample.dic +0 -0
  29. data/ext/marisa-0.2.4/bindings/python/sample.py +57 -0
  30. data/ext/marisa-0.2.4/bindings/python/setup.py +9 -0
  31. data/ext/marisa-0.2.4/config.guess +1530 -0
  32. data/ext/marisa-0.2.4/config.sub +1773 -0
  33. data/ext/marisa-0.2.4/configure +17636 -0
  34. data/ext/marisa-0.2.4/configure.ac +172 -0
  35. data/ext/marisa-0.2.4/depcomp +688 -0
  36. data/ext/marisa-0.2.4/docs/readme.en.html +740 -0
  37. data/ext/marisa-0.2.4/docs/readme.ja.html +750 -0
  38. data/ext/marisa-0.2.4/docs/style.css +245 -0
  39. data/ext/marisa-0.2.4/install-sh +520 -0
  40. data/ext/marisa-0.2.4/lib/Makefile.am +57 -0
  41. data/ext/marisa-0.2.4/lib/Makefile.in +701 -0
  42. data/ext/{marisa → marisa-0.2.4}/lib/marisa.h +0 -0
  43. data/ext/{marisa → marisa-0.2.4}/lib/marisa/agent.cc +2 -2
  44. data/ext/{marisa → marisa-0.2.4}/lib/marisa/agent.h +2 -2
  45. data/ext/{marisa → marisa-0.2.4}/lib/marisa/base.h +3 -3
  46. data/ext/{marisa → marisa-0.2.4}/lib/marisa/exception.h +1 -1
  47. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/algorithm.h +1 -1
  48. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/algorithm/sort.h +1 -1
  49. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/intrin.h +1 -1
  50. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io.h +3 -3
  51. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/mapper.cc +1 -1
  52. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/mapper.h +1 -1
  53. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/reader.cc +1 -1
  54. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/reader.h +1 -1
  55. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/writer.cc +1 -1
  56. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/io/writer.h +1 -1
  57. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie.h +2 -2
  58. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/cache.h +1 -1
  59. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/config.h +1 -1
  60. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/entry.h +1 -1
  61. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/header.h +1 -1
  62. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/history.h +1 -1
  63. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/key.h +1 -1
  64. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/louds-trie.cc +5 -5
  65. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/louds-trie.h +7 -7
  66. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/range.h +1 -1
  67. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/state.h +2 -2
  68. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/tail.cc +3 -3
  69. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/trie/tail.h +3 -3
  70. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector.h +3 -3
  71. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/bit-vector.cc +2 -2
  72. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/bit-vector.h +2 -2
  73. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/flat-vector.h +1 -1
  74. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/pop-count.h +1 -1
  75. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/rank-index.h +1 -1
  76. data/ext/{marisa → marisa-0.2.4}/lib/marisa/grimoire/vector/vector.h +1 -1
  77. data/ext/{marisa → marisa-0.2.4}/lib/marisa/iostream.h +0 -0
  78. data/ext/{marisa → marisa-0.2.4}/lib/marisa/key.h +1 -1
  79. data/ext/{marisa → marisa-0.2.4}/lib/marisa/keyset.cc +1 -1
  80. data/ext/{marisa → marisa-0.2.4}/lib/marisa/keyset.h +1 -1
  81. data/ext/{marisa → marisa-0.2.4}/lib/marisa/query.h +1 -1
  82. data/ext/{marisa → marisa-0.2.4}/lib/marisa/scoped-array.h +1 -1
  83. data/ext/{marisa → marisa-0.2.4}/lib/marisa/scoped-ptr.h +1 -1
  84. data/ext/{marisa → marisa-0.2.4}/lib/marisa/stdio.h +0 -0
  85. data/ext/{marisa → marisa-0.2.4}/lib/marisa/trie.cc +4 -4
  86. data/ext/{marisa → marisa-0.2.4}/lib/marisa/trie.h +2 -2
  87. data/ext/marisa-0.2.4/ltmain.sh +9661 -0
  88. data/ext/marisa-0.2.4/m4/libtool.m4 +8001 -0
  89. data/ext/marisa-0.2.4/m4/ltoptions.m4 +384 -0
  90. data/ext/marisa-0.2.4/m4/ltsugar.m4 +123 -0
  91. data/ext/marisa-0.2.4/m4/ltversion.m4 +23 -0
  92. data/ext/marisa-0.2.4/m4/lt~obsolete.m4 +98 -0
  93. data/ext/marisa-0.2.4/marisa.pc.in +11 -0
  94. data/ext/marisa-0.2.4/missing +331 -0
  95. data/ext/marisa-0.2.4/mkmf.log +288 -0
  96. data/ext/marisa-0.2.4/pkg/bin/marisa-benchmark +0 -0
  97. data/ext/marisa-0.2.4/pkg/bin/marisa-build +0 -0
  98. data/ext/marisa-0.2.4/pkg/bin/marisa-common-prefix-search +0 -0
  99. data/ext/marisa-0.2.4/pkg/bin/marisa-dump +0 -0
  100. data/ext/marisa-0.2.4/pkg/bin/marisa-lookup +0 -0
  101. data/ext/marisa-0.2.4/pkg/bin/marisa-predictive-search +0 -0
  102. data/ext/marisa-0.2.4/pkg/bin/marisa-reverse-lookup +0 -0
  103. data/ext/marisa-0.2.4/pkg/include/marisa.h +14 -0
  104. data/ext/marisa-0.2.4/pkg/include/marisa/agent.h +73 -0
  105. data/ext/marisa-0.2.4/pkg/include/marisa/base.h +193 -0
  106. data/ext/marisa-0.2.4/pkg/include/marisa/exception.h +82 -0
  107. data/ext/marisa-0.2.4/pkg/include/marisa/iostream.h +18 -0
  108. data/ext/marisa-0.2.4/pkg/include/marisa/key.h +85 -0
  109. data/ext/marisa-0.2.4/pkg/include/marisa/keyset.h +80 -0
  110. data/ext/marisa-0.2.4/pkg/include/marisa/query.h +71 -0
  111. data/ext/marisa-0.2.4/pkg/include/marisa/scoped-array.h +48 -0
  112. data/ext/marisa-0.2.4/pkg/include/marisa/scoped-ptr.h +52 -0
  113. data/ext/marisa-0.2.4/pkg/include/marisa/stdio.h +15 -0
  114. data/ext/marisa-0.2.4/pkg/include/marisa/trie.h +64 -0
  115. data/ext/marisa-0.2.4/pkg/lib/libmarisa.0.dylib +0 -0
  116. data/ext/marisa-0.2.4/pkg/lib/libmarisa.a +0 -0
  117. data/ext/marisa-0.2.4/pkg/lib/libmarisa.dylib +0 -0
  118. data/ext/marisa-0.2.4/pkg/lib/libmarisa.la +41 -0
  119. data/ext/marisa-0.2.4/pkg/lib/pkgconfig/marisa.pc +11 -0
  120. data/ext/marisa-0.2.4/tests/Makefile.am +27 -0
  121. data/ext/marisa-0.2.4/tests/Makefile.in +624 -0
  122. data/ext/{marisa → marisa-0.2.4}/tests/base-test.cc +0 -0
  123. data/ext/{marisa → marisa-0.2.4}/tests/io-test.cc +0 -0
  124. data/ext/{marisa → marisa-0.2.4}/tests/marisa-assert.h +0 -0
  125. data/ext/{marisa → marisa-0.2.4}/tests/marisa-test.cc +0 -0
  126. data/ext/{marisa → marisa-0.2.4}/tests/trie-test.cc +0 -0
  127. data/ext/{marisa → marisa-0.2.4}/tests/vector-test.cc +0 -0
  128. data/ext/marisa-0.2.4/tools/Makefile.am +39 -0
  129. data/ext/marisa-0.2.4/tools/Makefile.in +616 -0
  130. data/ext/{marisa → marisa-0.2.4}/tools/cmdopt.cc +0 -0
  131. data/ext/{marisa → marisa-0.2.4}/tools/cmdopt.h +0 -0
  132. data/ext/{marisa → marisa-0.2.4}/tools/marisa-benchmark.cc +0 -0
  133. data/ext/{marisa → marisa-0.2.4}/tools/marisa-build.cc +0 -0
  134. data/ext/{marisa → marisa-0.2.4}/tools/marisa-common-prefix-search.cc +0 -0
  135. data/ext/{marisa → marisa-0.2.4}/tools/marisa-dump.cc +0 -0
  136. data/ext/{marisa → marisa-0.2.4}/tools/marisa-lookup.cc +0 -0
  137. data/ext/{marisa → marisa-0.2.4}/tools/marisa-predictive-search.cc +0 -0
  138. data/ext/{marisa → marisa-0.2.4}/tools/marisa-reverse-lookup.cc +0 -0
  139. data/ext/marisa-0.2.4/vs2008/base-test/base-test.vcproj +200 -0
  140. data/ext/marisa-0.2.4/vs2008/io-test/io-test.vcproj +199 -0
  141. data/ext/marisa-0.2.4/vs2008/libmarisa/libmarisa.vcproj +347 -0
  142. data/ext/marisa-0.2.4/vs2008/marisa-benchmark/marisa-benchmark.vcproj +203 -0
  143. data/ext/marisa-0.2.4/vs2008/marisa-build/marisa-build.vcproj +203 -0
  144. data/ext/marisa-0.2.4/vs2008/marisa-common-prefix-search/marisa-common-prefix-search.vcproj +203 -0
  145. data/ext/marisa-0.2.4/vs2008/marisa-dump/marisa-dump.vcproj +203 -0
  146. data/ext/marisa-0.2.4/vs2008/marisa-lookup/marisa-lookup.vcproj +203 -0
  147. data/ext/marisa-0.2.4/vs2008/marisa-predictive-search/marisa-predictive-search.vcproj +203 -0
  148. data/ext/marisa-0.2.4/vs2008/marisa-reverse-lookup/marisa-reverse-lookup.vcproj +203 -0
  149. data/ext/marisa-0.2.4/vs2008/marisa-test/marisa-test.vcproj +199 -0
  150. data/ext/marisa-0.2.4/vs2008/trie-test/trie-test.vcproj +199 -0
  151. data/ext/marisa-0.2.4/vs2008/vector-test/vector-test.vcproj +199 -0
  152. data/ext/marisa-0.2.4/vs2008/vs2008.sln +123 -0
  153. data/ext/marisa-0.2.4/vs2008/vs2008.suo +0 -0
  154. data/ext/{marisa/bindings/ruby/marisa-swig.cxx → marisa-swig.cxx} +0 -0
  155. data/ext/{marisa/bindings/ruby/marisa-swig.h → marisa-swig.h} +0 -0
  156. data/ext/{marisa/bindings/ruby/marisa-swig_wrap.cxx → marisa-swig_wrap.cxx} +0 -0
  157. data/lib/melisa/bytes_trie.rb +5 -0
  158. data/lib/melisa/trie.rb +2 -0
  159. data/lib/melisa/version.rb +1 -1
  160. data/melisa.gemspec +7 -9
  161. data/spec/bytes_trie_spec.rb +6 -1
  162. data/spec/int_trie_spec.rb +5 -0
  163. data/spec/search_spec.rb +6 -7
  164. data/spec/trie_spec.rb +4 -4
  165. metadata +178 -121
  166. data/ext/marisa/bindings/ruby/extconf.rb +0 -5
File without changes
@@ -1,7 +1,7 @@
1
1
  #include <new>
2
2
 
3
- #include "marisa/agent.h"
4
- #include "marisa/grimoire/trie.h"
3
+ #include "agent.h"
4
+ #include "grimoire/trie.h"
5
5
 
6
6
  namespace marisa {
7
7
 
@@ -1,8 +1,8 @@
1
1
  #ifndef MARISA_AGENT_H_
2
2
  #define MARISA_AGENT_H_
3
3
 
4
- #include "marisa/key.h"
5
- #include "marisa/query.h"
4
+ #include "key.h"
5
+ #include "query.h"
6
6
 
7
7
  namespace marisa {
8
8
  namespace grimoire {
@@ -185,9 +185,9 @@ inline void swap(T &lhs, T &rhs) {
185
185
  #endif // __cplusplus
186
186
 
187
187
  #ifdef __cplusplus
188
- #include "marisa/exception.h"
189
- #include "marisa/scoped-ptr.h"
190
- #include "marisa/scoped-array.h"
188
+ #include "exception.h"
189
+ #include "scoped-ptr.h"
190
+ #include "scoped-array.h"
191
191
  #endif // __cplusplus
192
192
 
193
193
  #endif // MARISA_BASE_H_
@@ -3,7 +3,7 @@
3
3
 
4
4
  #include <exception>
5
5
 
6
- #include "marisa/base.h"
6
+ #include "base.h"
7
7
 
8
8
  namespace marisa {
9
9
 
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_ALGORITHM_H_
2
2
  #define MARISA_GRIMOIRE_ALGORITHM_H_
3
3
 
4
- #include "marisa/grimoire/algorithm/sort.h"
4
+ #include "algorithm/sort.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_ALGORITHM_SORT_H_
2
2
  #define MARISA_GRIMOIRE_ALGORITHM_SORT_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_INTRIN_H_
2
2
  #define MARISA_GRIMOIRE_INTRIN_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../base.h"
5
5
 
6
6
  #if defined(__x86_64__) || defined(_M_X64)
7
7
  #define MARISA_X64
@@ -1,9 +1,9 @@
1
1
  #ifndef MARISA_GRIMOIRE_IO_H_
2
2
  #define MARISA_GRIMOIRE_IO_H_
3
3
 
4
- #include "marisa/grimoire/io/mapper.h"
5
- #include "marisa/grimoire/io/reader.h"
6
- #include "marisa/grimoire/io/writer.h"
4
+ #include "io/mapper.h"
5
+ #include "io/reader.h"
6
+ #include "io/writer.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
@@ -10,7 +10,7 @@
10
10
  #include <unistd.h>
11
11
  #endif // (defined _WIN32) || (defined _WIN64)
12
12
 
13
- #include "marisa/grimoire/io/mapper.h"
13
+ #include "mapper.h"
14
14
 
15
15
  namespace marisa {
16
16
  namespace grimoire {
@@ -3,7 +3,7 @@
3
3
 
4
4
  #include <cstdio>
5
5
 
6
- #include "marisa/base.h"
6
+ #include "../../base.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
@@ -8,7 +8,7 @@
8
8
 
9
9
  #include <limits>
10
10
 
11
- #include "marisa/grimoire/io/reader.h"
11
+ #include "reader.h"
12
12
 
13
13
  namespace marisa {
14
14
  namespace grimoire {
@@ -4,7 +4,7 @@
4
4
  #include <cstdio>
5
5
  #include <iostream>
6
6
 
7
- #include "marisa/base.h"
7
+ #include "../../base.h"
8
8
 
9
9
  namespace marisa {
10
10
  namespace grimoire {
@@ -8,7 +8,7 @@
8
8
 
9
9
  #include <limits>
10
10
 
11
- #include "marisa/grimoire/io/writer.h"
11
+ #include "writer.h"
12
12
 
13
13
  namespace marisa {
14
14
  namespace grimoire {
@@ -4,7 +4,7 @@
4
4
  #include <cstdio>
5
5
  #include <iostream>
6
6
 
7
- #include "marisa/base.h"
7
+ #include "../../base.h"
8
8
 
9
9
  namespace marisa {
10
10
  namespace grimoire {
@@ -1,8 +1,8 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_H_
3
3
 
4
- #include "marisa/grimoire/trie/state.h"
5
- #include "marisa/grimoire/trie/louds-trie.h"
4
+ #include "trie/state.h"
5
+ #include "trie/louds-trie.h"
6
6
 
7
7
  namespace marisa {
8
8
  namespace grimoire {
@@ -3,7 +3,7 @@
3
3
 
4
4
  #include <cfloat>
5
5
 
6
- #include "marisa/base.h"
6
+ #include "../../base.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_CONFIG_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_CONFIG_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_ENTRY_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_ENTRY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_HEADER_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_HEADER_H_
3
3
 
4
- #include "marisa/grimoire/io.h"
4
+ #include "../io.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_STATE_HISTORY_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_STATE_HISTORY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_KEY_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_KEY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,11 +1,11 @@
1
1
  #include <algorithm>
2
2
  #include <queue>
3
3
 
4
- #include "marisa/grimoire/algorithm.h"
5
- #include "marisa/grimoire/trie/header.h"
6
- #include "marisa/grimoire/trie/range.h"
7
- #include "marisa/grimoire/trie/state.h"
8
- #include "marisa/grimoire/trie/louds-trie.h"
4
+ #include "../algorithm.h"
5
+ #include "header.h"
6
+ #include "range.h"
7
+ #include "state.h"
8
+ #include "louds-trie.h"
9
9
 
10
10
  namespace marisa {
11
11
  namespace grimoire {
@@ -1,13 +1,13 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_LOUDS_TRIE_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_LOUDS_TRIE_H_
3
3
 
4
- #include "marisa/keyset.h"
5
- #include "marisa/agent.h"
6
- #include "marisa/grimoire/vector.h"
7
- #include "marisa/grimoire/trie/config.h"
8
- #include "marisa/grimoire/trie/key.h"
9
- #include "marisa/grimoire/trie/tail.h"
10
- #include "marisa/grimoire/trie/cache.h"
4
+ #include "../../keyset.h"
5
+ #include "../../agent.h"
6
+ #include "../vector.h"
7
+ #include "config.h"
8
+ #include "key.h"
9
+ #include "tail.h"
10
+ #include "cache.h"
11
11
 
12
12
  namespace marisa {
13
13
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_RANGE_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_RANGE_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,8 +1,8 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_STATE_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_STATE_H_
3
3
 
4
- #include "marisa/grimoire/vector.h"
5
- #include "marisa/grimoire/trie/history.h"
4
+ #include "../vector.h"
5
+ #include "history.h"
6
6
 
7
7
  namespace marisa {
8
8
  namespace grimoire {
@@ -1,6 +1,6 @@
1
- #include "marisa/grimoire/algorithm.h"
2
- #include "marisa/grimoire/trie/state.h"
3
- #include "marisa/grimoire/trie/tail.h"
1
+ #include "../algorithm.h"
2
+ #include "state.h"
3
+ #include "tail.h"
4
4
 
5
5
  namespace marisa {
6
6
  namespace grimoire {
@@ -1,9 +1,9 @@
1
1
  #ifndef MARISA_GRIMOIRE_TRIE_TAIL_H_
2
2
  #define MARISA_GRIMOIRE_TRIE_TAIL_H_
3
3
 
4
- #include "marisa/agent.h"
5
- #include "marisa/grimoire/vector.h"
6
- #include "marisa/grimoire/trie/entry.h"
4
+ #include "../../agent.h"
5
+ #include "../vector.h"
6
+ #include "entry.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
@@ -1,9 +1,9 @@
1
1
  #ifndef MARISA_GRIMOIRE_VECTOR_H_
2
2
  #define MARISA_GRIMOIRE_VECTOR_H_
3
3
 
4
- #include "marisa/grimoire/vector/vector.h"
5
- #include "marisa/grimoire/vector/flat-vector.h"
6
- #include "marisa/grimoire/vector/bit-vector.h"
4
+ #include "vector/vector.h"
5
+ #include "vector/flat-vector.h"
6
+ #include "vector/bit-vector.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
@@ -1,5 +1,5 @@
1
- #include "marisa/grimoire/vector/pop-count.h"
2
- #include "marisa/grimoire/vector/bit-vector.h"
1
+ #include "pop-count.h"
2
+ #include "bit-vector.h"
3
3
 
4
4
  namespace marisa {
5
5
  namespace grimoire {
@@ -1,8 +1,8 @@
1
1
  #ifndef MARISA_GRIMOIRE_VECTOR_BIT_VECTOR_H_
2
2
  #define MARISA_GRIMOIRE_VECTOR_BIT_VECTOR_H_
3
3
 
4
- #include "marisa/grimoire/vector/rank-index.h"
5
- #include "marisa/grimoire/vector/vector.h"
4
+ #include "rank-index.h"
5
+ #include "vector.h"
6
6
 
7
7
  namespace marisa {
8
8
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_VECTOR_FLAT_VECTOR_H_
2
2
  #define MARISA_GRIMOIRE_VECTOR_FLAT_VECTOR_H_
3
3
 
4
- #include "marisa/grimoire/vector/vector.h"
4
+ #include "vector.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_VECTOR_POP_COUNT_H_
2
2
  #define MARISA_GRIMOIRE_VECTOR_POP_COUNT_H_
3
3
 
4
- #include "marisa/grimoire/intrin.h"
4
+ #include "../intrin.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_GRIMOIRE_VECTOR_RANK_INDEX_H_
2
2
  #define MARISA_GRIMOIRE_VECTOR_RANK_INDEX_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "../../base.h"
5
5
 
6
6
  namespace marisa {
7
7
  namespace grimoire {
@@ -3,7 +3,7 @@
3
3
 
4
4
  #include <new>
5
5
 
6
- #include "marisa/grimoire/io.h"
6
+ #include "../io.h"
7
7
 
8
8
  namespace marisa {
9
9
  namespace grimoire {
File without changes
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_KEY_H_
2
2
  #define MARISA_KEY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "base.h"
5
5
 
6
6
  namespace marisa {
7
7
 
@@ -1,6 +1,6 @@
1
1
  #include <new>
2
2
 
3
- #include "marisa/keyset.h"
3
+ #include "keyset.h"
4
4
 
5
5
  namespace marisa {
6
6
 
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_KEYSET_H_
2
2
  #define MARISA_KEYSET_H_
3
3
 
4
- #include "marisa/key.h"
4
+ #include "key.h"
5
5
 
6
6
  namespace marisa {
7
7
 
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_QUERY_H_
2
2
  #define MARISA_QUERY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "base.h"
5
5
 
6
6
  namespace marisa {
7
7
 
@@ -1,7 +1,7 @@
1
1
  #ifndef MARISA_SCOPED_ARRAY_H_
2
2
  #define MARISA_SCOPED_ARRAY_H_
3
3
 
4
- #include "marisa/base.h"
4
+ #include "base.h"
5
5
 
6
6
  namespace marisa {
7
7