diff --git a/de/d9b/prime__numbers_8cpp.html b/de/d9b/prime__numbers_8cpp.html index b2cd7ba12..5bd45086c 100644 --- a/de/d9b/prime__numbers_8cpp.html +++ b/de/d9b/prime__numbers_8cpp.html @@ -109,8 +109,8 @@ Include dependency graph for prime_numbers.cpp: - - + +

Functions

std::vector< int > primes (int max)
 
std::vector< int > primes (size_t max)
 
int main ()
 
@@ -134,31 +134,31 @@ Functions

main function

-
26 {
-
27 std::cout << "Calculate primes up to:\n>> ";
-
28 int n;
-
29 std::cin >> n;
-
30 std::vector<int> ans = primes(n);
-
31 for (int i = 0; i < ans.size(); i++) std::cout << ans[i] << ' ';
-
32 std::cout << std::endl;
-
33}
+
34 {
+
35 std::cout << "Calculate primes up to:\n>> ";
+
36 int n = 0;
+
37 std::cin >> n;
+
38 std::vector<int> ans = primes(n);
+
39 for (int p : ans) std::cout << p << ' ';
+
40 std::cout << std::endl;
+
41}
std::endl
T endl(T... args)
ans
ll ans(ll n)
Definition: matrix_exponentiation.cpp:91
-
primes
std::vector< int > primes(int max)
Definition: prime_numbers.cpp:12
+
primes
std::vector< int > primes(size_t max)
Definition: prime_numbers.cpp:12
Here is the call graph for this function:
-
+
- -

◆ primes()

+ +

◆ primes()

@@ -166,31 +166,39 @@ Here is the call graph for this function:
std::vector< int > primes ( - int  + size_t  max)

Generate an increasingly large number of primes and store in a list

-
12 {
-
13 max++;
-
14 std::vector<int> res;
-
15 std::vector<bool> numbers(max, false);
-
16 for (int i = 2; i < max; i++) {
-
17 if (!numbers[i]) {
-
18 for (int j = i; j < max; j += i) numbers[j] = true;
-
19 res.push_back(i);
-
20 }
-
21 }
-
22 return res;
-
23}
+
12 {
+
13 std::vector<int> res;
+
14 std::vector<bool> is_not_prime(max + 1, false);
+
15 for (size_t i = 2; i <= max; i++) {
+
16 if (!is_not_prime[i]) {
+
17 res.emplace_back(i);
+
18 }
+
19 for (int p : res) {
+
20 size_t k = i * p;
+
21 if (k > max) {
+
22 break;
+
23 }
+
24 is_not_prime[k] = true;
+
25 if (i % p == 0) {
+
26 break;
+
27 }
+
28 }
+
29 }
+
30 return res;
+
31}
+
std::vector::emplace_back
T emplace_back(T... args)
std::max
T max(T... args)
-
std::vector::push_back
T push_back(T... args)
Here is the call graph for this function:
-
+
diff --git a/de/d9b/prime__numbers_8cpp.js b/de/d9b/prime__numbers_8cpp.js index a251a2604..8cf28715e 100644 --- a/de/d9b/prime__numbers_8cpp.js +++ b/de/d9b/prime__numbers_8cpp.js @@ -1,5 +1,5 @@ var prime__numbers_8cpp = [ [ "main", "de/d9b/prime__numbers_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4", null ], - [ "primes", "de/d9b/prime__numbers_8cpp.html#a541b9728fd1db77516fee913763da90e", null ] + [ "primes", "de/d9b/prime__numbers_8cpp.html#a9575f3a51eeb8a57d657b3db6a4b441a", null ] ]; \ No newline at end of file diff --git a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.md5 b/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.md5 deleted file mode 100644 index c459d2d2a..000000000 --- a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.md5 +++ /dev/null @@ -1 +0,0 @@ -a9f20b22f35eb8963c014f0640e1acc2 \ No newline at end of file diff --git a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.map b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.map similarity index 77% rename from de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.map rename to de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.map index 1b0cb7097..bb340648e 100644 --- a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.map +++ b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.map @@ -1,4 +1,4 @@ - + diff --git a/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.md5 b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.md5 new file mode 100644 index 000000000..ad31e9f88 --- /dev/null +++ b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.md5 @@ -0,0 +1 @@ +010eda45daab80ba1ba3e0d2e4133002 \ No newline at end of file diff --git a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.svg b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.svg similarity index 63% rename from de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.svg rename to de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.svg index 0cc9e62a5..c6b95605a 100644 --- a/de/d9b/prime__numbers_8cpp_a541b9728fd1db77516fee913763da90e_cgraph.svg +++ b/de/d9b/prime__numbers_8cpp_a9575f3a51eeb8a57d657b3db6a4b441a_cgraph.svg @@ -4,11 +4,11 @@ - + primes - + Node1 @@ -21,17 +21,17 @@ Node2 - - -std::vector::push_back + + +std::vector::emplace_back Node1->Node2 - - + + diff --git a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.map b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.map index 475433759..73a6cf1f8 100644 --- a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.map +++ b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.map @@ -2,6 +2,6 @@ - - + + diff --git a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5 b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5 index 12951567f..ee6e55567 100644 --- a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5 +++ b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5 @@ -1 +1 @@ -4ab432d9bebd5828dbc11ffe9acb6140 \ No newline at end of file +a16a419a8f6d6602e913995578d1a61b \ No newline at end of file diff --git a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.svg b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.svg index 18eecc509..15e154704 100644 --- a/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.svg +++ b/de/d9b/prime__numbers_8cpp_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.svg @@ -4,11 +4,11 @@ - + main - + Node1 @@ -51,7 +51,7 @@ Node4 - + primes @@ -66,17 +66,17 @@ Node5 - - -std::vector::push_back + + +std::vector::emplace_back Node4->Node5 - - + + diff --git a/globals_func_p.html b/globals_func_p.html index 0291f4e6e..f3dd80a8f 100644 --- a/globals_func_p.html +++ b/globals_func_p.html @@ -105,7 +105,7 @@ $(document).ready(function(){initNavTree('globals_func_p.html',''); initResizabl
  • power() : power_for_huge_numbers.cpp, matrix_exponentiation.cpp
  • predict_OLS_regressor() : ordinary_least_squares_regressor.cpp
  • prime_factorization() : prime_factorization.cpp
    • -
  • primes() : prime_numbers.cpp
    • +
  • primes() : prime_numbers.cpp
  • print() : sieve_of_eratosthenes.cpp
  • printArray() : heap_sort.cpp
  • problem() : ode_forward_euler.cpp, ode_midpoint_euler.cpp, ode_semi_implicit_euler.cpp
    • diff --git a/globals_p.html b/globals_p.html index 73d842724..c6744635a 100644 --- a/globals_p.html +++ b/globals_p.html @@ -109,7 +109,7 @@ $(document).ready(function(){initNavTree('globals_p.html',''); initResizable();
  • prime : primes_up_to_billion.cpp
  • prime_factorization() : prime_factorization.cpp
  • prime_numbers : prime_factorization.cpp
    • -
  • primes() : prime_numbers.cpp
    • +
  • primes() : prime_numbers.cpp
  • print() : sieve_of_eratosthenes.cpp
  • printArray() : heap_sort.cpp
  • problem() : ode_forward_euler.cpp, ode_midpoint_euler.cpp, ode_semi_implicit_euler.cpp
    • diff --git a/navtreeindex13.js b/navtreeindex13.js index 359d4737d..8045bc3f8 100644 --- a/navtreeindex13.js +++ b/navtreeindex13.js @@ -31,7 +31,7 @@ var NAVTREEINDEX13 = "de/d88/travelling__salesman__problem_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4":[11,0,8,11,0], "de/d95/namespace_subsets.html":[9,0,105], "de/d9b/prime__numbers_8cpp.html":[11,0,14,42], -"de/d9b/prime__numbers_8cpp.html#a541b9728fd1db77516fee913763da90e":[11,0,14,42,1], +"de/d9b/prime__numbers_8cpp.html#a9575f3a51eeb8a57d657b3db6a4b441a":[11,0,14,42,1], "de/d9b/prime__numbers_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4":[11,0,14,42,0], "de/d9d/classdata__structures_1_1linked__list_1_1link.html":[10,0,1,0,0], "de/d9d/classdata__structures_1_1linked__list_1_1link.html":[9,0,18,0,0], diff --git a/search/all_11.js b/search/all_11.js index 0a56654ed..6ca764eb3 100644 --- a/search/all_11.js +++ b/search/all_11.js @@ -96,7 +96,7 @@ var searchData= ['prime_5ffactorization_2ecpp_93',['prime_factorization.cpp',['../db/d0d/prime__factorization_8cpp.html',1,'']]], ['prime_5fnumbers_94',['prime_numbers',['../db/d0d/prime__factorization_8cpp.html#af097796783684712b8326e5b82bfd4fe',1,'prime_factorization.cpp']]], ['prime_5fnumbers_2ecpp_95',['prime_numbers.cpp',['../de/d9b/prime__numbers_8cpp.html',1,'']]], - ['primes_96',['primes',['../de/d9b/prime__numbers_8cpp.html#a541b9728fd1db77516fee913763da90e',1,'prime_numbers.cpp']]], + ['primes_96',['primes',['../de/d9b/prime__numbers_8cpp.html#a9575f3a51eeb8a57d657b3db6a4b441a',1,'prime_numbers.cpp']]], ['primes_5fup_5fto_5fbillion_2ecpp_97',['primes_up_to_billion.cpp',['../d4/d9c/primes__up__to__billion_8cpp.html',1,'']]], ['print_98',['Print',['../d3/d95/classdata__structures_1_1tree__234_1_1_tree234.html#a2e9a9db7792cf5383f4c4cc418255165',1,'data_structures::tree_234::Tree234']]], ['print_99',['print',['../da/d6d/namespaceoperations__on__datastructures.html#a6109193567a5b7e36a27f2b4865fce20',1,'operations_on_datastructures::print()'],['../d8/ddf/sieve__of__eratosthenes_8cpp.html#a235843bdf82d2a6cc8596ae8fd3b8df9',1,'print(): sieve_of_eratosthenes.cpp'],['../de/dcf/classoperations__on__datastructures_1_1reverse__binary__tree_1_1_binary_tree.html#a5cf972a2c994a4fa1a89fc77bd5ad503',1,'operations_on_datastructures::reverse_binary_tree::BinaryTree::print()']]], diff --git a/search/functions_10.js b/search/functions_10.js index 76228a47c..27f7dc1ed 100644 --- a/search/functions_10.js +++ b/search/functions_10.js @@ -57,7 +57,7 @@ var searchData= ['prev_54',['prev',['http://en.cppreference.com/w/cpp/iterator/prev.html',0,'std']]], ['prev_5fpermutation_55',['prev_permutation',['http://en.cppreference.com/w/cpp/algorithm/prev_permutation.html',0,'std']]], ['prime_5ffactorization_56',['prime_factorization',['../db/d0d/prime__factorization_8cpp.html#a0ece0145fb29a5cf48378c23dde2da46',1,'prime_factorization.cpp']]], - ['primes_57',['primes',['../de/d9b/prime__numbers_8cpp.html#a541b9728fd1db77516fee913763da90e',1,'prime_numbers.cpp']]], + ['primes_57',['primes',['../de/d9b/prime__numbers_8cpp.html#a9575f3a51eeb8a57d657b3db6a4b441a',1,'prime_numbers.cpp']]], ['print_58',['print',['../da/d6d/namespaceoperations__on__datastructures.html#a6109193567a5b7e36a27f2b4865fce20',1,'operations_on_datastructures::print()'],['../d8/ddf/sieve__of__eratosthenes_8cpp.html#a235843bdf82d2a6cc8596ae8fd3b8df9',1,'print(): sieve_of_eratosthenes.cpp']]], ['print_59',['Print',['../d3/d95/classdata__structures_1_1tree__234_1_1_tree234.html#a2e9a9db7792cf5383f4c4cc418255165',1,'data_structures::tree_234::Tree234']]], ['print_60',['print',['../de/dcf/classoperations__on__datastructures_1_1reverse__binary__tree_1_1_binary_tree.html#a5cf972a2c994a4fa1a89fc77bd5ad503',1,'operations_on_datastructures::reverse_binary_tree::BinaryTree']]],