From f5812bd4d907fe1a83fcd993ea7f2a07d494f99a Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Sat, 14 Nov 2020 17:53:50 +0900 Subject: [PATCH 1/4] #71: change system includes of unittest --- test/unittest/basic_test.cpp | 3 ++- test/unittest/bit_test.cpp | 3 ++- test/unittest/convolution_test.cpp | 5 +++-- test/unittest/dsu_test.cpp | 3 ++- test/unittest/fenwicktree_test.cpp | 5 +++-- test/unittest/internal_math_test.cpp | 7 ++++--- test/unittest/lazysegtree_stress_test.cpp | 6 ++++-- test/unittest/lazysegtree_test.cpp | 3 ++- test/unittest/math_test.cpp | 3 ++- test/unittest/maxflow_test.cpp | 5 +++-- test/unittest/mincostflow_test.cpp | 7 ++++--- test/unittest/modint_test.cpp | 3 ++- test/unittest/scc_test.cpp | 4 ++-- test/unittest/segtree_test.cpp | 3 ++- test/unittest/string_test.cpp | 3 ++- test/unittest/twosat_test.cpp | 3 ++- test/unittest/type_traits_test.cpp | 3 ++- 17 files changed, 43 insertions(+), 26 deletions(-) diff --git a/test/unittest/basic_test.cpp b/test/unittest/basic_test.cpp index 28a298b..777aacf 100644 --- a/test/unittest/basic_test.cpp +++ b/test/unittest/basic_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/all" + #include #include diff --git a/test/unittest/bit_test.cpp b/test/unittest/bit_test.cpp index 802e013..18e38f4 100644 --- a/test/unittest/bit_test.cpp +++ b/test/unittest/bit_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/internal_bit" + #include #include diff --git a/test/unittest/convolution_test.cpp b/test/unittest/convolution_test.cpp index 90cc480..cf8f55a 100644 --- a/test/unittest/convolution_test.cpp +++ b/test/unittest/convolution_test.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "atcoder/convolution" +#include "atcoder/modint" + #include #include "../utils/random.hpp" diff --git a/test/unittest/dsu_test.cpp b/test/unittest/dsu_test.cpp index 1797b2d..cca95e3 100644 --- a/test/unittest/dsu_test.cpp +++ b/test/unittest/dsu_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/dsu" + #include #include diff --git a/test/unittest/fenwicktree_test.cpp b/test/unittest/fenwicktree_test.cpp index e00a331..17ffc78 100644 --- a/test/unittest/fenwicktree_test.cpp +++ b/test/unittest/fenwicktree_test.cpp @@ -1,5 +1,6 @@ -#include -#include +#include "atcoder/fenwicktree" +#include "atcoder/modint" + #include #include diff --git a/test/unittest/internal_math_test.cpp b/test/unittest/internal_math_test.cpp index 014847b..7e26406 100644 --- a/test/unittest/internal_math_test.cpp +++ b/test/unittest/internal_math_test.cpp @@ -1,8 +1,9 @@ -#include -#include +#include "atcoder/internal_math" + #include "../utils/math.hpp" -#include +#include +#include using namespace atcoder; using uint = unsigned int; diff --git a/test/unittest/lazysegtree_stress_test.cpp b/test/unittest/lazysegtree_stress_test.cpp index 8da3a52..f45ffec 100644 --- a/test/unittest/lazysegtree_stress_test.cpp +++ b/test/unittest/lazysegtree_stress_test.cpp @@ -1,6 +1,8 @@ -#include -#include +#include "atcoder/lazysegtree" + #include "../utils/random.hpp" + +#include #include #include diff --git a/test/unittest/lazysegtree_test.cpp b/test/unittest/lazysegtree_test.cpp index ff2d7e0..d408a6b 100644 --- a/test/unittest/lazysegtree_test.cpp +++ b/test/unittest/lazysegtree_test.cpp @@ -1,5 +1,6 @@ +#include "atcoder/lazysegtree" + #include -#include #include #include diff --git a/test/unittest/math_test.cpp b/test/unittest/math_test.cpp index e211c79..c2d80a9 100644 --- a/test/unittest/math_test.cpp +++ b/test/unittest/math_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/math" + #include #include diff --git a/test/unittest/maxflow_test.cpp b/test/unittest/maxflow_test.cpp index 44c1574..dbdf5b6 100644 --- a/test/unittest/maxflow_test.cpp +++ b/test/unittest/maxflow_test.cpp @@ -1,8 +1,9 @@ -#include +#include "atcoder/maxflow" +#include "../utils/random.hpp" + #include #include #include -#include "../utils/random.hpp" #include diff --git a/test/unittest/mincostflow_test.cpp b/test/unittest/mincostflow_test.cpp index 293b4ec..6db41cb 100644 --- a/test/unittest/mincostflow_test.cpp +++ b/test/unittest/mincostflow_test.cpp @@ -1,10 +1,11 @@ -#include -#include +#include "atcoder/maxflow" +#include "atcoder/mincostflow" + +#include "../utils/random.hpp" #include #include #include -#include "../utils/random.hpp" #include diff --git a/test/unittest/modint_test.cpp b/test/unittest/modint_test.cpp index 9229eeb..81f33cc 100644 --- a/test/unittest/modint_test.cpp +++ b/test/unittest/modint_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/modint" + #include #include diff --git a/test/unittest/scc_test.cpp b/test/unittest/scc_test.cpp index 4124a73..50b7cc8 100644 --- a/test/unittest/scc_test.cpp +++ b/test/unittest/scc_test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "atcoder/scc" +#include "atcoder/modint" #include #include diff --git a/test/unittest/segtree_test.cpp b/test/unittest/segtree_test.cpp index e95ae6a..0f49e1c 100644 --- a/test/unittest/segtree_test.cpp +++ b/test/unittest/segtree_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/segtree" + #include #include diff --git a/test/unittest/string_test.cpp b/test/unittest/string_test.cpp index c7ead7c..037f817 100644 --- a/test/unittest/string_test.cpp +++ b/test/unittest/string_test.cpp @@ -1,5 +1,6 @@ +#include "atcoder/string" + #include -#include #include #include diff --git a/test/unittest/twosat_test.cpp b/test/unittest/twosat_test.cpp index cbf5b68..0122554 100644 --- a/test/unittest/twosat_test.cpp +++ b/test/unittest/twosat_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/twosat" + #include #include "../utils/random.hpp" diff --git a/test/unittest/type_traits_test.cpp b/test/unittest/type_traits_test.cpp index 15ce726..aa4ca67 100644 --- a/test/unittest/type_traits_test.cpp +++ b/test/unittest/type_traits_test.cpp @@ -1,4 +1,5 @@ -#include +#include "atcoder/internal_type_traits" + #include #include From 93bc2820ea2889d391cc6b2d337299a8c2b16d77 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Sat, 14 Nov 2020 19:05:31 +0900 Subject: [PATCH 2/4] #71: fix expander.py for local includes --- expander.py | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/expander.py b/expander.py index ff41810..2f98f88 100755 --- a/expander.py +++ b/expander.py @@ -13,10 +13,12 @@ class Expander: + local_include = re.compile( + r'#include\s*"([a-z_]*(|.hpp))"\s*') atcoder_include = re.compile( - '#include\s*["<](atcoder/[a-z_]*(|.hpp))[">]\s*') + r'#include\s*["<](atcoder/[a-z_]*(|.hpp))[">]\s*') - include_guard = re.compile('#.*ATCODER_[A-Z_]*_HPP') + include_guard = re.compile(r'#.*ATCODER_[A-Z_]*_HPP') def is_ignored_line(self, line) -> bool: if self.include_guard.match(line): @@ -30,27 +32,24 @@ def is_ignored_line(self, line) -> bool: def __init__(self, lib_paths: List[Path]): self.lib_paths = lib_paths - included = set() # type: Set[str] + included = set() # type: Set[Path] - def find_acl(self, acl_name: str) -> Optional[Path]: + def find_acl(self, acl_name: str) -> Path: for lib_path in self.lib_paths: path = lib_path / acl_name if path.exists(): return path - return None + logger.error('cannot find: {}'.format(acl_name)) + raise FileNotFoundError() - def expand_acl(self, acl_name: str) -> List[str]: - if acl_name in self.included: - logger.info('already included: {}'.format(acl_name)) + def expand_acl(self, acl_file_path: Path) -> List[str]: + if acl_file_path in self.included: + logger.info('already included: {}'.format(acl_file_path.name)) return [] - self.included.add(acl_name) - logger.info('include: {}'.format(acl_name)) - acl_path = self.find_acl(acl_name) - if not acl_path: - logger.warning('cannot find: {}'.format(acl_name)) - raise FileNotFoundError() + self.included.add(acl_file_path) + logger.info('include: {}'.format(acl_file_path.name)) - acl_source = open(str(acl_path)).read() + acl_source = open(str(acl_file_path)).read() result = [] # type: List[str] for line in acl_source.splitlines(): @@ -59,7 +58,14 @@ def expand_acl(self, acl_name: str) -> List[str]: m = self.atcoder_include.match(line) if m: - result.extend(self.expand_acl(m.group(1))) + name = m.group(1) + result.extend(self.expand_acl(self.find_acl(name))) + continue + + m = self.local_include.match(line) + if m: + name = m.group(1) + result.extend(self.expand_acl(acl_file_path.parent / name)) continue result.append(line) @@ -71,10 +77,11 @@ def expand(self, source: str) -> str: result = [] # type: List[str] for line in source.splitlines(): m = self.atcoder_include.match(line) - if m: - result.extend(self.expand_acl(m.group(1))) + acl_path = self.find_acl(m.group(1)) + result.extend(self.expand_acl(acl_path)) continue + result.append(line) return '\n'.join(result) From 3d73d2fadf2b315b962b40d95ce0c285b370f440 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Sat, 14 Nov 2020 19:05:59 +0900 Subject: [PATCH 3/4] #71: system includes into local includes --- atcoder/all | 24 ++++++++++++------------ atcoder/convolution | 2 +- atcoder/convolution.hpp | 5 +++-- atcoder/dsu | 2 +- atcoder/fenwicktree | 2 +- atcoder/fenwicktree.hpp | 3 ++- atcoder/internal_bit | 2 +- atcoder/internal_math | 2 +- atcoder/internal_queue | 2 +- atcoder/internal_scc | 2 +- atcoder/internal_type_traits | 2 +- atcoder/lazysegtree | 2 +- atcoder/lazysegtree.hpp | 4 +++- atcoder/math | 2 +- atcoder/math.hpp | 3 ++- atcoder/maxflow | 2 +- atcoder/maxflow.hpp | 3 ++- atcoder/mincostflow | 2 +- atcoder/modint | 2 +- atcoder/modint.hpp | 5 +++-- atcoder/scc | 2 +- atcoder/scc.hpp | 3 ++- atcoder/segtree | 2 +- atcoder/segtree.hpp | 3 ++- atcoder/string | 2 +- atcoder/twosat | 2 +- atcoder/twosat.hpp | 3 ++- 27 files changed, 50 insertions(+), 40 deletions(-) diff --git a/atcoder/all b/atcoder/all index 112458e..f7919a0 100644 --- a/atcoder/all +++ b/atcoder/all @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "convolution" +#include "dsu" +#include "fenwicktree" +#include "lazysegtree" +#include "math" +#include "maxflow" +#include "mincostflow" +#include "modint" +#include "scc" +#include "segtree" +#include "string" +#include "twosat" diff --git a/atcoder/convolution b/atcoder/convolution index 4668477..ae3c5dc 100644 --- a/atcoder/convolution +++ b/atcoder/convolution @@ -1 +1 @@ -#include +#include "convolution.hpp" diff --git a/atcoder/convolution.hpp b/atcoder/convolution.hpp index 04cc20f..6611b3e 100644 --- a/atcoder/convolution.hpp +++ b/atcoder/convolution.hpp @@ -3,12 +3,13 @@ #include #include -#include -#include #include #include #include +#include "internal_bit" +#include "modint" + namespace atcoder { namespace internal { diff --git a/atcoder/dsu b/atcoder/dsu index 846e8cb..92726cb 100644 --- a/atcoder/dsu +++ b/atcoder/dsu @@ -1 +1 @@ -#include +#include "dsu.hpp" diff --git a/atcoder/fenwicktree b/atcoder/fenwicktree index f2febd1..079c06f 100644 --- a/atcoder/fenwicktree +++ b/atcoder/fenwicktree @@ -1 +1 @@ -#include +#include "fenwicktree.hpp" diff --git a/atcoder/fenwicktree.hpp b/atcoder/fenwicktree.hpp index 3e49e90..082a5e9 100644 --- a/atcoder/fenwicktree.hpp +++ b/atcoder/fenwicktree.hpp @@ -1,10 +1,11 @@ #ifndef ATCODER_FENWICKTREE_HPP #define ATCODER_FENWICKTREE_HPP 1 -#include #include #include +#include "internal_type_traits" + namespace atcoder { // Reference: https://en.wikipedia.org/wiki/Fenwick_tree diff --git a/atcoder/internal_bit b/atcoder/internal_bit index c7443cc..2d82248 100644 --- a/atcoder/internal_bit +++ b/atcoder/internal_bit @@ -1 +1 @@ -#include +#include "internal_bit.hpp" diff --git a/atcoder/internal_math b/atcoder/internal_math index b228a70..a4df6ea 100644 --- a/atcoder/internal_math +++ b/atcoder/internal_math @@ -1 +1 @@ -#include +#include "internal_math.hpp" diff --git a/atcoder/internal_queue b/atcoder/internal_queue index 9cb49b3..2bad6ba 100644 --- a/atcoder/internal_queue +++ b/atcoder/internal_queue @@ -1 +1 @@ -#include +#include "internal_queue.hpp" diff --git a/atcoder/internal_scc b/atcoder/internal_scc index 21d8865..bc1b0d4 100644 --- a/atcoder/internal_scc +++ b/atcoder/internal_scc @@ -1 +1 @@ -#include +#include "internal_scc.hpp" diff --git a/atcoder/internal_type_traits b/atcoder/internal_type_traits index 87fd106..feeb9b8 100644 --- a/atcoder/internal_type_traits +++ b/atcoder/internal_type_traits @@ -1 +1 @@ -#include +#include "internal_type_traits.hpp" diff --git a/atcoder/lazysegtree b/atcoder/lazysegtree index 7323e25..18908b7 100644 --- a/atcoder/lazysegtree +++ b/atcoder/lazysegtree @@ -1 +1 @@ -#include +#include "lazysegtree.hpp" diff --git a/atcoder/lazysegtree.hpp b/atcoder/lazysegtree.hpp index 8d23989..ee97cf7 100644 --- a/atcoder/lazysegtree.hpp +++ b/atcoder/lazysegtree.hpp @@ -2,10 +2,12 @@ #define ATCODER_LAZYSEGTREE_HPP 1 #include -#include #include #include #include + +#include "internal_bit" + namespace atcoder { template +#include "math.hpp" diff --git a/atcoder/math.hpp b/atcoder/math.hpp index dd68ca9..b6c5573 100644 --- a/atcoder/math.hpp +++ b/atcoder/math.hpp @@ -5,7 +5,8 @@ #include #include #include -#include + +#include "internal_math" namespace atcoder { diff --git a/atcoder/maxflow b/atcoder/maxflow index 64d215c..186c7fc 100644 --- a/atcoder/maxflow +++ b/atcoder/maxflow @@ -1 +1 @@ -#include +#include "maxflow.hpp" diff --git a/atcoder/maxflow.hpp b/atcoder/maxflow.hpp index 6f535b9..b6734cf 100644 --- a/atcoder/maxflow.hpp +++ b/atcoder/maxflow.hpp @@ -2,12 +2,13 @@ #define ATCODER_MAXFLOW_HPP 1 #include -#include #include #include #include #include +#include "internal_queue" + namespace atcoder { template struct mf_graph { diff --git a/atcoder/mincostflow b/atcoder/mincostflow index f6c451e..42a663a 100644 --- a/atcoder/mincostflow +++ b/atcoder/mincostflow @@ -1 +1 @@ -#include +#include "mincostflow.hpp" diff --git a/atcoder/modint b/atcoder/modint index a0dfdc3..5ec5495 100644 --- a/atcoder/modint +++ b/atcoder/modint @@ -1 +1 @@ -#include +#include "modint.hpp" diff --git a/atcoder/modint.hpp b/atcoder/modint.hpp index 78df9ef..7943382 100644 --- a/atcoder/modint.hpp +++ b/atcoder/modint.hpp @@ -1,8 +1,6 @@ #ifndef ATCODER_MODINT_HPP #define ATCODER_MODINT_HPP 1 -#include -#include #include #include #include @@ -11,6 +9,9 @@ #include #endif +#include "internal_math" +#include "internal_type_traits" + namespace atcoder { namespace internal { diff --git a/atcoder/scc b/atcoder/scc index 6fda4bf..e63b582 100644 --- a/atcoder/scc +++ b/atcoder/scc @@ -1 +1 @@ -#include +#include "scc.hpp" diff --git a/atcoder/scc.hpp b/atcoder/scc.hpp index 6623b76..c798749 100644 --- a/atcoder/scc.hpp +++ b/atcoder/scc.hpp @@ -2,10 +2,11 @@ #define ATCODER_SCC_HPP 1 #include -#include #include #include +#include "internal_scc" + namespace atcoder { struct scc_graph { diff --git a/atcoder/segtree b/atcoder/segtree index 60a0d88..e50e5a6 100644 --- a/atcoder/segtree +++ b/atcoder/segtree @@ -1 +1 @@ -#include +#include "segtree.hpp" diff --git a/atcoder/segtree.hpp b/atcoder/segtree.hpp index 31e1662..a2230f3 100644 --- a/atcoder/segtree.hpp +++ b/atcoder/segtree.hpp @@ -2,10 +2,11 @@ #define ATCODER_SEGTREE_HPP 1 #include -#include #include #include +#include "internal_bit" + namespace atcoder { template struct segtree { diff --git a/atcoder/string b/atcoder/string index f4b40a1..e6196c8 100644 --- a/atcoder/string +++ b/atcoder/string @@ -1 +1 @@ -#include +#include "string.hpp" diff --git a/atcoder/twosat b/atcoder/twosat index 324a4c8..4135312 100644 --- a/atcoder/twosat +++ b/atcoder/twosat @@ -1 +1 @@ -#include +#include "twosat.hpp" diff --git a/atcoder/twosat.hpp b/atcoder/twosat.hpp index e16c443..08480a8 100644 --- a/atcoder/twosat.hpp +++ b/atcoder/twosat.hpp @@ -1,10 +1,11 @@ #ifndef ATCODER_TWOSAT_HPP #define ATCODER_TWOSAT_HPP 1 -#include #include #include +#include "internal_scc" + namespace atcoder { // Reference: From 22e502fe652d11ef273bd169a5e965eb04927532 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Sun, 15 Nov 2020 00:01:18 +0900 Subject: [PATCH 4/4] #71: include xxx to include atcoder/xxx --- atcoder/all | 24 ++++++++++++------------ atcoder/convolution | 2 +- atcoder/convolution.hpp | 4 ++-- atcoder/dsu | 2 +- atcoder/fenwicktree | 2 +- atcoder/fenwicktree.hpp | 2 +- atcoder/internal_bit | 2 +- atcoder/internal_math | 2 +- atcoder/internal_queue | 2 +- atcoder/internal_scc | 2 +- atcoder/internal_type_traits | 2 +- atcoder/lazysegtree | 2 +- atcoder/lazysegtree.hpp | 2 +- atcoder/math | 2 +- atcoder/math.hpp | 2 +- atcoder/maxflow | 2 +- atcoder/maxflow.hpp | 2 +- atcoder/mincostflow | 2 +- atcoder/modint | 2 +- atcoder/modint.hpp | 4 ++-- atcoder/scc | 2 +- atcoder/scc.hpp | 2 +- atcoder/segtree | 2 +- atcoder/segtree.hpp | 2 +- atcoder/string | 2 +- atcoder/twosat | 2 +- atcoder/twosat.hpp | 2 +- 27 files changed, 40 insertions(+), 40 deletions(-) diff --git a/atcoder/all b/atcoder/all index f7919a0..666568e 100644 --- a/atcoder/all +++ b/atcoder/all @@ -1,12 +1,12 @@ -#include "convolution" -#include "dsu" -#include "fenwicktree" -#include "lazysegtree" -#include "math" -#include "maxflow" -#include "mincostflow" -#include "modint" -#include "scc" -#include "segtree" -#include "string" -#include "twosat" +#include "atcoder/convolution" +#include "atcoder/dsu" +#include "atcoder/fenwicktree" +#include "atcoder/lazysegtree" +#include "atcoder/math" +#include "atcoder/maxflow" +#include "atcoder/mincostflow" +#include "atcoder/modint" +#include "atcoder/scc" +#include "atcoder/segtree" +#include "atcoder/string" +#include "atcoder/twosat" diff --git a/atcoder/convolution b/atcoder/convolution index ae3c5dc..a768486 100644 --- a/atcoder/convolution +++ b/atcoder/convolution @@ -1 +1 @@ -#include "convolution.hpp" +#include "atcoder/convolution.hpp" diff --git a/atcoder/convolution.hpp b/atcoder/convolution.hpp index 6611b3e..166e356 100644 --- a/atcoder/convolution.hpp +++ b/atcoder/convolution.hpp @@ -7,8 +7,8 @@ #include #include -#include "internal_bit" -#include "modint" +#include "atcoder/internal_bit" +#include "atcoder/modint" namespace atcoder { diff --git a/atcoder/dsu b/atcoder/dsu index 92726cb..8052180 100644 --- a/atcoder/dsu +++ b/atcoder/dsu @@ -1 +1 @@ -#include "dsu.hpp" +#include "atcoder/dsu.hpp" diff --git a/atcoder/fenwicktree b/atcoder/fenwicktree index 079c06f..c7371dc 100644 --- a/atcoder/fenwicktree +++ b/atcoder/fenwicktree @@ -1 +1 @@ -#include "fenwicktree.hpp" +#include "atcoder/fenwicktree.hpp" diff --git a/atcoder/fenwicktree.hpp b/atcoder/fenwicktree.hpp index 082a5e9..ab7c63b 100644 --- a/atcoder/fenwicktree.hpp +++ b/atcoder/fenwicktree.hpp @@ -4,7 +4,7 @@ #include #include -#include "internal_type_traits" +#include "atcoder/internal_type_traits" namespace atcoder { diff --git a/atcoder/internal_bit b/atcoder/internal_bit index 2d82248..a24ec48 100644 --- a/atcoder/internal_bit +++ b/atcoder/internal_bit @@ -1 +1 @@ -#include "internal_bit.hpp" +#include "atcoder/internal_bit.hpp" diff --git a/atcoder/internal_math b/atcoder/internal_math index a4df6ea..84042f5 100644 --- a/atcoder/internal_math +++ b/atcoder/internal_math @@ -1 +1 @@ -#include "internal_math.hpp" +#include "atcoder/internal_math.hpp" diff --git a/atcoder/internal_queue b/atcoder/internal_queue index 2bad6ba..36cca9d 100644 --- a/atcoder/internal_queue +++ b/atcoder/internal_queue @@ -1 +1 @@ -#include "internal_queue.hpp" +#include "atcoder/internal_queue.hpp" diff --git a/atcoder/internal_scc b/atcoder/internal_scc index bc1b0d4..fd49944 100644 --- a/atcoder/internal_scc +++ b/atcoder/internal_scc @@ -1 +1 @@ -#include "internal_scc.hpp" +#include "atcoder/internal_scc.hpp" diff --git a/atcoder/internal_type_traits b/atcoder/internal_type_traits index feeb9b8..31b2695 100644 --- a/atcoder/internal_type_traits +++ b/atcoder/internal_type_traits @@ -1 +1 @@ -#include "internal_type_traits.hpp" +#include "atcoder/internal_type_traits.hpp" diff --git a/atcoder/lazysegtree b/atcoder/lazysegtree index 18908b7..0f3875f 100644 --- a/atcoder/lazysegtree +++ b/atcoder/lazysegtree @@ -1 +1 @@ -#include "lazysegtree.hpp" +#include "atcoder/lazysegtree.hpp" diff --git a/atcoder/lazysegtree.hpp b/atcoder/lazysegtree.hpp index ee97cf7..e9c0c63 100644 --- a/atcoder/lazysegtree.hpp +++ b/atcoder/lazysegtree.hpp @@ -6,7 +6,7 @@ #include #include -#include "internal_bit" +#include "atcoder/internal_bit" namespace atcoder { diff --git a/atcoder/math b/atcoder/math index 07a104b..0636021 100644 --- a/atcoder/math +++ b/atcoder/math @@ -1 +1 @@ -#include "math.hpp" +#include "atcoder/math.hpp" diff --git a/atcoder/math.hpp b/atcoder/math.hpp index b6c5573..ec5bca5 100644 --- a/atcoder/math.hpp +++ b/atcoder/math.hpp @@ -6,7 +6,7 @@ #include #include -#include "internal_math" +#include "atcoder/internal_math" namespace atcoder { diff --git a/atcoder/maxflow b/atcoder/maxflow index 186c7fc..66df972 100644 --- a/atcoder/maxflow +++ b/atcoder/maxflow @@ -1 +1 @@ -#include "maxflow.hpp" +#include "atcoder/maxflow.hpp" diff --git a/atcoder/maxflow.hpp b/atcoder/maxflow.hpp index b6734cf..d74cfad 100644 --- a/atcoder/maxflow.hpp +++ b/atcoder/maxflow.hpp @@ -7,7 +7,7 @@ #include #include -#include "internal_queue" +#include "atcoder/internal_queue" namespace atcoder { diff --git a/atcoder/mincostflow b/atcoder/mincostflow index 42a663a..ed3ad2a 100644 --- a/atcoder/mincostflow +++ b/atcoder/mincostflow @@ -1 +1 @@ -#include "mincostflow.hpp" +#include "atcoder/mincostflow.hpp" diff --git a/atcoder/modint b/atcoder/modint index 5ec5495..1aeaacb 100644 --- a/atcoder/modint +++ b/atcoder/modint @@ -1 +1 @@ -#include "modint.hpp" +#include "atcoder/modint.hpp" diff --git a/atcoder/modint.hpp b/atcoder/modint.hpp index 7943382..a00a650 100644 --- a/atcoder/modint.hpp +++ b/atcoder/modint.hpp @@ -9,8 +9,8 @@ #include #endif -#include "internal_math" -#include "internal_type_traits" +#include "atcoder/internal_math" +#include "atcoder/internal_type_traits" namespace atcoder { diff --git a/atcoder/scc b/atcoder/scc index e63b582..cdf451a 100644 --- a/atcoder/scc +++ b/atcoder/scc @@ -1 +1 @@ -#include "scc.hpp" +#include "atcoder/scc.hpp" diff --git a/atcoder/scc.hpp b/atcoder/scc.hpp index c798749..29e120f 100644 --- a/atcoder/scc.hpp +++ b/atcoder/scc.hpp @@ -5,7 +5,7 @@ #include #include -#include "internal_scc" +#include "atcoder/internal_scc" namespace atcoder { diff --git a/atcoder/segtree b/atcoder/segtree index e50e5a6..150f785 100644 --- a/atcoder/segtree +++ b/atcoder/segtree @@ -1 +1 @@ -#include "segtree.hpp" +#include "atcoder/segtree.hpp" diff --git a/atcoder/segtree.hpp b/atcoder/segtree.hpp index a2230f3..789fa33 100644 --- a/atcoder/segtree.hpp +++ b/atcoder/segtree.hpp @@ -5,7 +5,7 @@ #include #include -#include "internal_bit" +#include "atcoder/internal_bit" namespace atcoder { diff --git a/atcoder/string b/atcoder/string index e6196c8..7df6f26 100644 --- a/atcoder/string +++ b/atcoder/string @@ -1 +1 @@ -#include "string.hpp" +#include "atcoder/string.hpp" diff --git a/atcoder/twosat b/atcoder/twosat index 4135312..7e83c51 100644 --- a/atcoder/twosat +++ b/atcoder/twosat @@ -1 +1 @@ -#include "twosat.hpp" +#include "atcoder/twosat.hpp" diff --git a/atcoder/twosat.hpp b/atcoder/twosat.hpp index 08480a8..25b9706 100644 --- a/atcoder/twosat.hpp +++ b/atcoder/twosat.hpp @@ -4,7 +4,7 @@ #include #include -#include "internal_scc" +#include "atcoder/internal_scc" namespace atcoder {