Skip to content

Commit

Permalink
Rename generate.cpp to generate_primes.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
kimwalisch committed Jul 27, 2024
1 parent 1ca6498 commit e7fba93
Show file tree
Hide file tree
Showing 36 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ set(LIB_SRC src/api.cpp
src/LoadBalancerS2.cpp
src/LogarithmicIntegral.cpp
src/StatusS2.cpp
src/generate.cpp
src/generate_primes.cpp
src/nth_prime.cpp
src/phi.cpp
src/phi_vector.cpp
Expand Down
8 changes: 4 additions & 4 deletions include/generate.hpp → include/generate_primes.hpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
///
/// @file generate.hpp
/// @file generate_primes.hpp
///
/// Copyright (C) 2024 Kim Walisch, <[email protected]>
///
/// This file is distributed under the BSD License. See the COPYING
/// file in the top level directory.
///

#ifndef GENERATE_HPP
#define GENERATE_HPP
#ifndef GENERATE_PRIMES_HPP
#define GENERATE_PRIMES_HPP

#include <Vector.hpp>

Expand All @@ -17,7 +17,7 @@

namespace primecount {

/// defined in generate.cpp
/// defined in generate_primes.cpp
Vector<int32_t> generate_primes_i32(int64_t max);
Vector<uint32_t> generate_primes_u32(int64_t max);
Vector<int64_t> generate_primes_i64(int64_t max);
Expand Down
2 changes: 1 addition & 1 deletion src/P3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
///

#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <macros.hpp>
#include <PiTable.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/S1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <primecount-internal.hpp>
#include <PhiTiny.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <int128_t.hpp>
#include <Vector.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/deleglise-rivat/S2_easy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <PiTable.hpp>
#include <primecount-internal.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <int128_t.hpp>
#include <min.hpp>
#include <imath.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/deleglise-rivat/S2_easy_libdivide.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <PiTable.hpp>
#include <primecount-internal.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <int128_t.hpp>
#include <min.hpp>
#include <imath.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/deleglise-rivat/S2_hard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <FactorTable.hpp>
#include <Sieve.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <phi_vector.hpp>
#include <imath.hpp>
#include <int128_t.hpp>
Expand Down
4 changes: 2 additions & 2 deletions src/generate.cpp → src/generate_primes.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
///
/// @file generate.cpp
/// @file generate_primes.cpp
///
/// Copyright (C) 2024 Kim Walisch, <[email protected]>
///
/// This file is distributed under the BSD License. See the COPYING
/// file in the top level directory.
///

#include <generate.hpp>
#include <generate_primes.hpp>
#include <int128_t.hpp>
#include <isqrt.hpp>
#include <primesieve.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/gourdon/AC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <primecount-internal.hpp>
#include <LoadBalancerAC.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <gourdon.hpp>
#include <int128_t.hpp>
#include <min.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/gourdon/AC_libdivide.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <primecount-internal.hpp>
#include <LoadBalancerAC.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <gourdon.hpp>
#include <int128_t.hpp>
#include <libdivide.h>
Expand Down
2 changes: 1 addition & 1 deletion src/gourdon/D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <Sieve.hpp>
#include <LoadBalancerS2.hpp>
#include <fast_div.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <phi_vector.hpp>
#include <gourdon.hpp>
#include <imath.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/gourdon/Phi0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <gourdon.hpp>
#include <primecount-internal.hpp>
#include <PhiTiny.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <int128_t.hpp>
#include <print.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
///

#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <PhiTiny.hpp>
#include <imath.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <primecount-internal.hpp>
#include <imath.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <Vector.hpp>
#include <PhiTiny.hpp>
#include <S.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
///

#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <min.hpp>
#include <Vector.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
///

#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <min.hpp>
#include <PhiTiny.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <primecount-internal.hpp>
#include <Sieve.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <min.hpp>
#include <imath.hpp>
#include <PhiTiny.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/lmo/pi_lmo_parallel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <primecount-internal.hpp>
#include <Sieve.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <phi_vector.hpp>
#include <LoadBalancerS2.hpp>
#include <min.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/phi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <primecount-internal.hpp>
#include <BitSieve240.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <fast_div.hpp>
#include <imath.hpp>
#include <macros.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/P2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <primecount.hpp>
#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/P3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
///

#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/deleglise-rivat/S2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <primecount.hpp>
#include <primecount-internal.hpp>
#include <PhiTiny.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <S.hpp>

Expand Down
2 changes: 1 addition & 1 deletion test/deleglise-rivat/S2_easy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <primecount-internal.hpp>
#include <PhiTiny.hpp>
#include <PiTable.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <min.hpp>
#include <S.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/deleglise-rivat/S2_hard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <primecount.hpp>
#include <primecount-internal.hpp>
#include <PhiTiny.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <S.hpp>

Expand Down
2 changes: 1 addition & 1 deletion test/deleglise-rivat/S2_trivial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <primecount.hpp>
#include <primecount-internal.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <PhiTiny.hpp>
#include <imath.hpp>
#include <S.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/generate_lpf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// file in the top level directory.
///

#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/generate_pi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/// file in the top level directory.
///

#include <generate.hpp>
#include <generate_primes.hpp>
#include <primesieve.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/gourdon/FactorTableD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define ENABLE_MU_0_TESTING

#include <FactorTableD.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <int128_t.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/lmo/BinaryIndexedTree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
///

#include <BinaryIndexedTree.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/lmo/FactorTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define ENABLE_MU_0_TESTING

#include <FactorTable.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <int128_t.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/lmo/S1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
///

#include <primecount.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <PhiTiny.hpp>
#include <imath.hpp>
#include <S.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/moebius.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/// file in the top level directory.
///

#include <generate.hpp>
#include <generate_primes.hpp>

#include <stdint.h>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion test/phi_tiny.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
///

#include <PhiTiny.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>

#include <stdint.h>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion test/phi_vector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
///

#include <primecount.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>
#include <phi_vector.hpp>
#include <PiTable.hpp>
Expand Down
2 changes: 1 addition & 1 deletion test/sieve1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
///

#include <Sieve.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion test/sieve2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
///

#include <Sieve.hpp>
#include <generate.hpp>
#include <generate_primes.hpp>
#include <imath.hpp>

#include <stdint.h>
Expand Down

0 comments on commit e7fba93

Please sign in to comment.