From cfe214ef52a7621ec914a7d2a1e034009b22f8fa Mon Sep 17 00:00:00 2001 From: Tifa <62847935+Tiphereth-A@users.noreply.github.com> Date: Sat, 1 Mar 2025 17:16:20 +0800 Subject: [PATCH] refactor: rename --- config.yml | 4 ++-- src/code/conv/{conv_minplus_ca.hpp => conv_minplus_cv.hpp} | 6 +++--- .../conv/{conv_minplus_cc.hpp => conv_minplus_cv_cv.hpp} | 6 +++--- src/doc_md/conv/conv_minplus_ca.md | 4 ---- src/doc_md/conv/conv_minplus_cc.md | 4 ---- src/doc_md/conv/conv_minplus_cv.md | 4 ++++ src/doc_md/conv/conv_minplus_cv_cv.md | 4 ++++ .../conv/{conv_minplus_ca.tex => conv_minplus_cv.tex} | 0 .../conv/{conv_minplus_cc.tex => conv_minplus_cv_cv.tex} | 0 .../min_plus_convolution_convex_arbitrary.test.cpp | 4 ++-- .../min_plus_convolution_convex_convex.test.cpp | 4 ++-- .../conv/{conv_minplus_ca.cpp => conv_minplus_cv.cpp} | 0 .../conv/{conv_minplus_cc.cpp => conv_minplus_cv_cv.cpp} | 0 13 files changed, 20 insertions(+), 20 deletions(-) rename src/code/conv/{conv_minplus_ca.hpp => conv_minplus_cv.hpp} (83%) rename src/code/conv/{conv_minplus_cc.hpp => conv_minplus_cv_cv.hpp} (78%) delete mode 100644 src/doc_md/conv/conv_minplus_ca.md delete mode 100644 src/doc_md/conv/conv_minplus_cc.md create mode 100644 src/doc_md/conv/conv_minplus_cv.md create mode 100644 src/doc_md/conv/conv_minplus_cv_cv.md rename src/doc_tex/conv/{conv_minplus_ca.tex => conv_minplus_cv.tex} (100%) rename src/doc_tex/conv/{conv_minplus_cc.tex => conv_minplus_cv_cv.tex} (100%) rename src/test_tinplate/conv/{conv_minplus_ca.cpp => conv_minplus_cv.cpp} (100%) rename src/test_tinplate/conv/{conv_minplus_cc.cpp => conv_minplus_cv_cv.cpp} (100%) diff --git a/config.yml b/config.yml index 8463c84a7..7c89531d3 100644 --- a/config.yml +++ b/config.yml @@ -1149,10 +1149,10 @@ notebook: - conv_lcm: 卷积(LCM) code_ext: hpp test_ext: cpp - - conv_minplus_ca: 卷积(min-plus,一个凸序列) + - conv_minplus_cv: 卷积(min-plus,一个凸序列) code_ext: hpp test_ext: cpp - - conv_minplus_cc: 卷积(min-plus,两个凸序列) + - conv_minplus_cv_cv: 卷积(min-plus,两个凸序列) code_ext: hpp test_ext: cpp poly: diff --git a/src/code/conv/conv_minplus_ca.hpp b/src/code/conv/conv_minplus_cv.hpp similarity index 83% rename from src/code/conv/conv_minplus_ca.hpp rename to src/code/conv/conv_minplus_cv.hpp index 07c68518d..3fcfb9d97 100644 --- a/src/code/conv/conv_minplus_ca.hpp +++ b/src/code/conv/conv_minplus_cv.hpp @@ -1,5 +1,5 @@ -#ifndef TIFALIBS_CONV_CONV_MINPLUS_CA -#define TIFALIBS_CONV_CONV_MINPLUS_CA +#ifndef TIFALIBS_CONV_CONV_MINPLUS_CV +#define TIFALIBS_CONV_CONV_MINPLUS_CV #include "../opt/smawk.hpp" @@ -8,7 +8,7 @@ namespace tifa_libs::math { //! assume a is convex, aka. $a_{i-1} - a_{i-2} \leq a_i - a_{i-1}$ //! assume b is arbitary, aka. $b_i = b_j \iff i = j$ template -CEXP vec conv_minplus_ca(vec CR a, vec CR b) NE { +CEXP vec conv_minplus_cv(vec CR a, vec CR b) NE { const u32 n = (u32)a.size(), m = (u32)b.size(); const vecu argmin = opt::smawk( n + m - 1, diff --git a/src/code/conv/conv_minplus_cc.hpp b/src/code/conv/conv_minplus_cv_cv.hpp similarity index 78% rename from src/code/conv/conv_minplus_cc.hpp rename to src/code/conv/conv_minplus_cv_cv.hpp index 778724c4a..300994b9a 100644 --- a/src/code/conv/conv_minplus_cc.hpp +++ b/src/code/conv/conv_minplus_cv_cv.hpp @@ -1,5 +1,5 @@ -#ifndef TIFALIBS_CONV_CONV_MINPLUS_CC -#define TIFALIBS_CONV_CONV_MINPLUS_CC +#ifndef TIFALIBS_CONV_CONV_MINPLUS_CV_CV +#define TIFALIBS_CONV_CONV_MINPLUS_CV_CV #include "../util/util.hpp" @@ -7,7 +7,7 @@ namespace tifa_libs::math { //! assume a and b are convex, aka. $a_{i-1} - a_{i-2} \leq a_i - a_{i-1}$ and it also holds for b template -CEXP vec conv_minplus_cc(vec CR a, vec CR b) NE { +CEXP vec conv_minplus_cv_cv(vec CR a, vec CR b) NE { const u32 n = (u32)a.size(), m = (u32)b.size(); vec c(n + m - 1); c[0] = a[0] + b[0]; diff --git a/src/doc_md/conv/conv_minplus_ca.md b/src/doc_md/conv/conv_minplus_ca.md deleted file mode 100644 index be86ff170..000000000 --- a/src/doc_md/conv/conv_minplus_ca.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: conv_minplus_ca -documentation_of: //src/code/conv/conv_minplus_ca.hpp ---- diff --git a/src/doc_md/conv/conv_minplus_cc.md b/src/doc_md/conv/conv_minplus_cc.md deleted file mode 100644 index 0c5774a69..000000000 --- a/src/doc_md/conv/conv_minplus_cc.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: conv_minplus_cc -documentation_of: //src/code/conv/conv_minplus_cc.hpp ---- diff --git a/src/doc_md/conv/conv_minplus_cv.md b/src/doc_md/conv/conv_minplus_cv.md new file mode 100644 index 000000000..3cd244023 --- /dev/null +++ b/src/doc_md/conv/conv_minplus_cv.md @@ -0,0 +1,4 @@ +--- +title: conv_minplus_cv +documentation_of: //src/code/conv/conv_minplus_cv.hpp +--- diff --git a/src/doc_md/conv/conv_minplus_cv_cv.md b/src/doc_md/conv/conv_minplus_cv_cv.md new file mode 100644 index 000000000..b5a6ad9bc --- /dev/null +++ b/src/doc_md/conv/conv_minplus_cv_cv.md @@ -0,0 +1,4 @@ +--- +title: conv_minplus_cv_cv +documentation_of: //src/code/conv/conv_minplus_cv_cv.hpp +--- diff --git a/src/doc_tex/conv/conv_minplus_ca.tex b/src/doc_tex/conv/conv_minplus_cv.tex similarity index 100% rename from src/doc_tex/conv/conv_minplus_ca.tex rename to src/doc_tex/conv/conv_minplus_cv.tex diff --git a/src/doc_tex/conv/conv_minplus_cc.tex b/src/doc_tex/conv/conv_minplus_cv_cv.tex similarity index 100% rename from src/doc_tex/conv/conv_minplus_cc.tex rename to src/doc_tex/conv/conv_minplus_cv_cv.tex diff --git a/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_arbitrary.test.cpp b/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_arbitrary.test.cpp index 3ef8bba96..4cde5942b 100644 --- a/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_arbitrary.test.cpp +++ b/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_arbitrary.test.cpp @@ -1,6 +1,6 @@ #define PROBLEM "https://judge.yosupo.jp/problem/min_plus_convolution_convex_arbitrary" -#include "../../code/conv/conv_minplus_ca.hpp" +#include "../../code/conv/conv_minplus_cv.hpp" #include "../../code/io/ios_container.hpp" int main() { @@ -9,6 +9,6 @@ int main() { std::cin >> n >> m; vecu a(n), b(m); std::cin >> a >> b; - std::cout << tifa_libs::math::conv_minplus_ca(a, b) << '\n'; + std::cout << tifa_libs::math::conv_minplus_cv(a, b) << '\n'; return 0; } diff --git a/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_convex.test.cpp b/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_convex.test.cpp index 54f88d7b7..5b3c49cd5 100644 --- a/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_convex.test.cpp +++ b/src/test_cpverifier/library-checker-convolution/min_plus_convolution_convex_convex.test.cpp @@ -1,6 +1,6 @@ #define PROBLEM "https://judge.yosupo.jp/problem/min_plus_convolution_convex_convex" -#include "../../code/conv/conv_minplus_cc.hpp" +#include "../../code/conv/conv_minplus_cv_cv.hpp" #include "../../code/io/ios_container.hpp" int main() { @@ -9,6 +9,6 @@ int main() { std::cin >> n >> m; vecu a(n), b(m); std::cin >> a >> b; - std::cout << tifa_libs::math::conv_minplus_cc(a, b) << '\n'; + std::cout << tifa_libs::math::conv_minplus_cv_cv(a, b) << '\n'; return 0; } diff --git a/src/test_tinplate/conv/conv_minplus_ca.cpp b/src/test_tinplate/conv/conv_minplus_cv.cpp similarity index 100% rename from src/test_tinplate/conv/conv_minplus_ca.cpp rename to src/test_tinplate/conv/conv_minplus_cv.cpp diff --git a/src/test_tinplate/conv/conv_minplus_cc.cpp b/src/test_tinplate/conv/conv_minplus_cv_cv.cpp similarity index 100% rename from src/test_tinplate/conv/conv_minplus_cc.cpp rename to src/test_tinplate/conv/conv_minplus_cv_cv.cpp