Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Performance: 58% faster Project Euler 070 - #10558

Closed
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070
Closed

Performance: 58% faster Project Euler 070#10558
ManpreetXSingh wants to merge 14 commits into
TheAlgorithms:masterfrom
ManpreetXSingh:performance-project-euler-070

Conversation

@ManpreetXSingh

@ManpreetXSinghManpreetXSingh commented Oct 15, 2023

Copy link
Copy Markdown
Contributor

Describe your change:

#8594

  • Benchmark:
    • Old solution: 118.2/10 seconds
    • New solution: 49.3/10 seconds
  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new Python files are placed inside an existing directory.
  • All filenames are in all lowercase characters with no spaces or dashes.
  • All functions and variable names follow Python naming conventions.
  • All function parameters and return values are annotated with Python type hints.
  • All functions have doctests that pass the automated testing.
  • All new algorithms include at least one URL that points to Wikipedia or another similar explanation.
  • If this pull request resolves one or more open issues then the description above includes the issue number(s) with a closing keyword: "Fixes #ISSUE-NUMBER".

@algorithms-keeperalgorithms-keeperBot added enhancement This PR modified some existing files awaiting reviews This PR is ready to be reviewed labels Oct 15, 2023
@ManpreetXSinghManpreetXSingh changed the title Performance: 52% faster Project Euler 070Performance: 58% faster Project Euler 070Oct 16, 2023
@quant12345

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 a good solution with filtering by prime numbers. Look at 072, I made it, you can probably apply it there too.

@ManpreetXSingh

ManpreetXSingh commented Oct 18, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @quant12345,
Thank you for your suggestion! Your input is much appreciated!
I noticed that the prime filtering for 072 is already implemented in sol2.py. Although it is as fast as sol1 with both taking 1 sec. What should be done in this case?
Also, I've identified a bug in 'sol1.py' that appears to be related to integer overflow. This issue specifically arises on Windows platforms because, by default, numpy on Windows 64-bit uses 32-bit integers, whereas on Linux, it employs 64-bit integers, so it also went unnoticed in automated checking of this repo. See #10672. I already have 3 PRs open so bot closes new ones.

@quant12345

quant12345 commented Oct 18, 2023

Copy link
Copy Markdown
Contributor

@manpreetsingh2004 now I checked it in Windows, it’s really an incorrect number if you don’t specify the type. I used your filtering(072) by prime numbers. And with this it’s faster, significantly. Below code:

test

import datetime
import numpy as np
from math import isqrt
def solution_2(limit: int = 1_000_000) -> int:
"""
Return the number of reduced proper fractions with denominator less than limit.
>>> solution(8)
21
>>> solution(1000)
304191
"""
primes = set(range(3, limit, 2))
primes.add(2)
for p in range(3, limit, 2):
if p not in primes:
continue
primes.difference_update(set(range(p * p, limit, p)))
phi = [float(n) for n in range(limit + 1)]
for p in primes:
for n in range(p, limit + 1, p):
phi[n] *= 1 - 1 / p
return int(sum(phi[2:]))
def np_calculate_prime_numbers(max_number: int) -> list[int]:
"""
Returns prime numbers below max_number.
See: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
>>> np_calculate_prime_numbers(10)
[2, 3, 5, 7]
>>> np_calculate_prime_numbers(2)
[]
"""
if max_number <= 2:
return []
# List containing a bool value for every odd number below max_number/2
is_prime = np.ones(max_number // 2, dtype=bool)
for i in range(3, isqrt(max_number - 1) + 1, 2):
if is_prime[i // 2]:
# Mark all multiple of i as not prime using list slicing
is_prime[i ** 2 // 2:: i] = False
primes = np.where(is_prime)[0] * 2 + 1
primes[0] = 2
return primes
def solution_new(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
primes = np_calculate_prime_numbers(limit)
for i in primes:
#ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[2*i::i] -= phi[2*i::i] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
def solution(limit: int = 1_000_000) -> int:
"""
Returns an integer, the solution to the problem
>>> solution(10)
31
>>> solution(100)
3043
>>> solution(1_000)
304191
"""
# generating an array from -1 to limit
phi = np.arange(-1, limit)
for i in range(2, limit + 1):
if phi[i] == i - 1:
ind = np.arange(2 * i, limit + 1, i) # indexes for selection
phi[ind] -= phi[ind] // i
return int(np.sum(phi[2: limit + 1], dtype=np.int64))
if __name__ == "__main__":
n = 1_000_000
now = datetime.datetime.now()
old = solution(n)
print('old_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
new = solution_new(n)
print('new_time', datetime.datetime.now() - now)
now = datetime.datetime.now()
solution_2 = solution_2(n)
print('solution_2', datetime.datetime.now() - now)
print('comparison for identity', old == new == solution_2)

Output:

old_time 0:00:00.773152
new_time 0:00:00.410564
solution_2 0:00:01.439802
comparison for identity True

Here is a slightly faster implementation primes of primesfrom2to than 'your' primesfrom3to.

@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

@quant12345
Hey, That's really nice. 😊

@dhruvmaniladhruvmanila left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I'm sorry if I was not clear but we should be updating existing solution to make it performant instead of adding new solution(s). The benchmarks can be added in the PR description instead of the code. We only want one solution in the code. Can you please update the code accordingly?

@algorithms-keeperalgorithms-keeperBot added awaiting changes A maintainer has requested changes to this PR and removed awaiting reviews This PR is ready to be reviewed labels Oct 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

We only want one solution in the code.

@dhruvmanila
If I understand correctly, the three slower solutions (slow_solution, slicing_solution, py_solution) should be removed. Am I correct?

@algorithms-keeperalgorithms-keeperBot added awaiting reviews This PR is ready to be reviewed and removed awaiting changes A maintainer has requested changes to this PR labels Dec 29, 2023
@ManpreetXSingh

Copy link
Copy Markdown
ContributorAuthor

Hi @dhruvmanila,
I've made the requested changes. Please let me know if any additional adjustments are needed.
The get_totients function is modified. The remainder of the solution remains unchanged from its original form.
Also I've put the benchmark results in the PR description.

@ManpreetXSinghManpreetXSingh closed this by deleting the head repository Aug 19, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting reviewsThis PR is ready to be reviewedenhancementThis PR modified some existing files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ManpreetXSingh@quant12345@dhruvmanila