From 6d45cee6d1d57893bee3c7035bd64ed200cb184c Mon Sep 17 00:00:00 2001 From: tknsgk Date: Tue, 10 Feb 2026 17:56:44 +0900 Subject: [PATCH] rename --- .github/workflows/test.yml | 12 ++++++------ .../Math/Combination/{Comb.cpp => Combination.cpp} | 4 ++-- .../{test_comb.sh => test_combination.sh} | 4 ++-- .../Combination/{Comb.java => Combination.java} | 4 ++-- .../SegmentTree/{SegTree.java => SegmentTree.java} | 4 ++-- .../{test_comb.sh => test_combination.sh} | 14 +++++++------- .../{test_segtree.sh => test_segmenttree.sh} | 14 +++++++------- 7 files changed, 28 insertions(+), 28 deletions(-) rename src/cpp/lib/Math/Combination/{Comb.cpp => Combination.cpp} (91%) rename src/cpp/test/Math/Combination/{test_comb.sh => test_combination.sh} (93%) rename src/java/lib/Math/Combination/{Comb.java => Combination.java} (93%) rename src/java/lib/Tree/SegmentTree/{SegTree.java => SegmentTree.java} (94%) rename src/java/test/Math/Combination/{test_comb.sh => test_combination.sh} (78%) rename src/java/test/Tree/SegmentTree/{test_segtree.sh => test_segmenttree.sh} (81%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d631da..9bba156 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,8 +53,8 @@ jobs: - name: Run C++ Primes test run: src/cpp/test/Math/Calc/test_primes.sh - - name: Run C++ Comb test - run: src/cpp/test/Math/Combination/test_comb.sh + - name: Run C++ Combination test + run: src/cpp/test/Math/Combination/test_combination.sh - name: Run C++ ModPow test run: src/cpp/test/Math/ModPow/test_modpow.sh @@ -118,14 +118,14 @@ jobs: - name: Run Java Primes test run: src/java/test/Math/Calc/test_primes.sh - - name: Run Java Comb test - run: src/java/test/Math/Combination/test_comb.sh + - name: Run Java Combination test + run: src/java/test/Math/Combination/test_combination.sh - name: Run Java ModPow test run: src/java/test/Math/ModPow/test_modpow.sh - - name: Run Java SegTree test - run: src/java/test/Tree/SegmentTree/test_segtree.sh + - name: Run Java SegmentTree test + run: src/java/test/Tree/SegmentTree/test_segmenttree.sh - name: Run Java UnionFind test run: src/java/test/Tree/UnionFind/test_unionfind.sh diff --git a/src/cpp/lib/Math/Combination/Comb.cpp b/src/cpp/lib/Math/Combination/Combination.cpp similarity index 91% rename from src/cpp/lib/Math/Combination/Comb.cpp rename to src/cpp/lib/Math/Combination/Combination.cpp index 21e76d2..a86474e 100644 --- a/src/cpp/lib/Math/Combination/Comb.cpp +++ b/src/cpp/lib/Math/Combination/Combination.cpp @@ -1,12 +1,12 @@ #include using namespace std; -struct Comb { +struct Combination { int n; long long MOD; vector facts; - Comb(int n, long long MOD) : n(n), MOD(MOD), facts(n + 1) { + Combination(int n, long long MOD) : n(n), MOD(MOD), facts(n + 1) { facts[0] = 1; for (int i = 1; i < n + 1; i++) { facts[i] = facts[i - 1] * i % MOD; diff --git a/src/cpp/test/Math/Combination/test_comb.sh b/src/cpp/test/Math/Combination/test_combination.sh similarity index 93% rename from src/cpp/test/Math/Combination/test_comb.sh rename to src/cpp/test/Math/Combination/test_combination.sh index 30238e9..d554539 100755 --- a/src/cpp/test/Math/Combination/test_comb.sh +++ b/src/cpp/test/Math/Combination/test_combination.sh @@ -1,6 +1,6 @@ #!/bin/bash SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -SRC="$SCRIPT_DIR/../../../lib/Math/Combination/Comb.cpp" +SRC="$SCRIPT_DIR/../../../lib/Math/Combination/Combination.cpp" TMPDIR=$(mktemp -d) BIN="$TMPDIR/test_comb" @@ -11,7 +11,7 @@ int main() { int n; long long MOD; cin >> n >> MOD; - Comb comb(n, MOD); + Combination comb(n, MOD); int q; cin >> q; for (int i = 0; i < q; i++) { diff --git a/src/java/lib/Math/Combination/Comb.java b/src/java/lib/Math/Combination/Combination.java similarity index 93% rename from src/java/lib/Math/Combination/Comb.java rename to src/java/lib/Math/Combination/Combination.java index 1cf7cfb..f1c0b9c 100644 --- a/src/java/lib/Math/Combination/Comb.java +++ b/src/java/lib/Math/Combination/Combination.java @@ -1,11 +1,11 @@ package Math.Combination; -public class Comb { +public class Combination { int n; // number of elements int MOD = (int)1e9+7; long[] facts; - public Comb(int n, int MOD){ + public Combination(int n, int MOD){ this.n = n; this.MOD = MOD; facts = new long[n+1]; diff --git a/src/java/lib/Tree/SegmentTree/SegTree.java b/src/java/lib/Tree/SegmentTree/SegmentTree.java similarity index 94% rename from src/java/lib/Tree/SegmentTree/SegTree.java rename to src/java/lib/Tree/SegmentTree/SegmentTree.java index d660ec7..e926b66 100644 --- a/src/java/lib/Tree/SegmentTree/SegTree.java +++ b/src/java/lib/Tree/SegmentTree/SegmentTree.java @@ -1,12 +1,12 @@ //RMQ (Range Minimum Query) package Tree.SegmentTree; -public class SegTree { +public class SegmentTree { int n = 1; int[] val; - public SegTree(int n) { + public SegmentTree(int n) { while (this.n < n) this.n *= 2; val = new int[2*this.n-1]; } diff --git a/src/java/test/Math/Combination/test_comb.sh b/src/java/test/Math/Combination/test_combination.sh similarity index 78% rename from src/java/test/Math/Combination/test_comb.sh rename to src/java/test/Math/Combination/test_combination.sh index 37c9134..a7e602a 100755 --- a/src/java/test/Math/Combination/test_comb.sh +++ b/src/java/test/Math/Combination/test_combination.sh @@ -1,22 +1,22 @@ #!/bin/bash SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -SRC="$SCRIPT_DIR/../../../lib/Math/Combination/Comb.java" +SRC="$SCRIPT_DIR/../../../lib/Math/Combination/Combination.java" TMPDIR=$(mktemp -d) PKG_DIR="$TMPDIR/Math/Combination" mkdir -p "$PKG_DIR" -cp "$SRC" "$PKG_DIR/Comb.java" +cp "$SRC" "$PKG_DIR/Combination.java" -cat > "$PKG_DIR/CombTest.java" << 'DRIVER' +cat > "$PKG_DIR/CombinationTest.java" << 'DRIVER' package Math.Combination; import java.util.Scanner; -public class CombTest { +public class CombinationTest { public static void main(String[] args) { Scanner sc = new Scanner(System.in); int n = sc.nextInt(); int MOD = sc.nextInt(); - Comb comb = new Comb(n, MOD); + Combination comb = new Combination(n, MOD); int q = sc.nextInt(); for (int i = 0; i < q; i++) { String cmd = sc.next(); @@ -32,14 +32,14 @@ public class CombTest { } DRIVER -javac "$PKG_DIR/Comb.java" "$PKG_DIR/CombTest.java" || { echo "COMPILE FAILED"; rm -rf "$TMPDIR"; exit 1; } +javac "$PKG_DIR/Combination.java" "$PKG_DIR/CombinationTest.java" || { echo "COMPILE FAILED"; rm -rf "$TMPDIR"; exit 1; } pass=0 fail=0 run_test() { local name="$1" input="$2" expected="$3" - actual=$(echo "$input" | java -cp "$TMPDIR" Math.Combination.CombTest | sed 's/[[:space:]]*$//') + actual=$(echo "$input" | java -cp "$TMPDIR" Math.Combination.CombinationTest | sed 's/[[:space:]]*$//') expected=$(echo "$expected" | sed 's/[[:space:]]*$//') if [ "$actual" = "$expected" ]; then echo "PASS: $name" diff --git a/src/java/test/Tree/SegmentTree/test_segtree.sh b/src/java/test/Tree/SegmentTree/test_segmenttree.sh similarity index 81% rename from src/java/test/Tree/SegmentTree/test_segtree.sh rename to src/java/test/Tree/SegmentTree/test_segmenttree.sh index 9ae6790..a2577e5 100755 --- a/src/java/test/Tree/SegmentTree/test_segtree.sh +++ b/src/java/test/Tree/SegmentTree/test_segmenttree.sh @@ -1,22 +1,22 @@ #!/bin/bash SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -SRC="$SCRIPT_DIR/../../../lib/Tree/SegmentTree/SegTree.java" +SRC="$SCRIPT_DIR/../../../lib/Tree/SegmentTree/SegmentTree.java" TMPDIR=$(mktemp -d) PKG_DIR="$TMPDIR/Tree/SegmentTree" mkdir -p "$PKG_DIR" -cp "$SRC" "$PKG_DIR/SegTree.java" +cp "$SRC" "$PKG_DIR/SegmentTree.java" -cat > "$PKG_DIR/SegTreeTest.java" << 'DRIVER' +cat > "$PKG_DIR/SegmentTreeTest.java" << 'DRIVER' package Tree.SegmentTree; import java.util.Scanner; -public class SegTreeTest { +public class SegmentTreeTest { public static void main(String[] args) { Scanner sc = new Scanner(System.in); int n = sc.nextInt(); int q = sc.nextInt(); - SegTree st = new SegTree(n); + SegmentTree st = new SegmentTree(n); st.init(n); for (int i = 0; i < q; i++) { String cmd = sc.next(); @@ -34,14 +34,14 @@ public class SegTreeTest { } DRIVER -javac "$PKG_DIR/SegTree.java" "$PKG_DIR/SegTreeTest.java" || { echo "COMPILE FAILED"; rm -rf "$TMPDIR"; exit 1; } +javac "$PKG_DIR/SegmentTree.java" "$PKG_DIR/SegmentTreeTest.java" || { echo "COMPILE FAILED"; rm -rf "$TMPDIR"; exit 1; } pass=0 fail=0 run_test() { local name="$1" input="$2" expected="$3" - actual=$(echo "$input" | java -cp "$TMPDIR" Tree.SegmentTree.SegTreeTest | sed 's/[[:space:]]*$//') + actual=$(echo "$input" | java -cp "$TMPDIR" Tree.SegmentTree.SegmentTreeTest | sed 's/[[:space:]]*$//') expected=$(echo "$expected" | sed 's/[[:space:]]*$//') if [ "$actual" = "$expected" ]; then echo "PASS: $name"