update environment (#118)

* update environment

* update python version

* downgrade numpy

* downgrade primesieve

* downgrade numpy

* downgrade everything

* adding python versions

* adding python versions

* remove python versions

* attempt to update numpy version

* removing python 3.8

* update primesieve version

* remove the use of primesieve package

* fix some solutions

* fix more solutions

* remove the sieve function as implemented in python

* add more python versions

* remove py 3.9, 3.10 and 3.11

Author: KerimovEmil

.github/workflows/python-package.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: ["3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v2

all_build_tests/test_build.py

@@ -8,7 +8,7 @@
 
 for file in listdir(file_path):
     # ignore known files that don't follow convention
-    if file in ['new_problem.py', '__init__.py', '__pycache__']:
+    if file in ['new_problem.py', '__init__.py', '__pycache__', '.ruff_cache']:
         continue
 
     # get project euler problem number from file name

requirements.txt

@@ -1,2 +1 @@
-numpy==1.22.1
-primesieve==2.3.0
+numpy==2.3.2

solutions/PE10.py

@@ -7,11 +7,8 @@
 ANSWER: 142913828922
 Solve time: ~ 0.02 seconds
 """
-
-from primesieve import primes
-
 import unittest
-from util.utils import timeit
+from util.utils import timeit, primes_upto
 
 
 class Problem10:
@@ -20,7 +17,7 @@ def __init__(self, n):
 
     @timeit
     def solve(self):
-        return sum(primes(self.n))
+        return sum(primes_upto(self.n))
 
     @timeit
     def lucy_algo(self):  # see comment below

solutions/PE111.py

@@ -36,8 +36,7 @@
 
 import unittest
 import itertools
-from util.utils import sieve
-from util.utils import timeit
+from util.utils import timeit, primes_upto
 
 
 class Problem111:
@@ -51,7 +50,7 @@ def __init__(self, n, debug):
         max_int = int(10 ** (self.n / 2))
         if self.debug:
             print("Calculating Primes")
-        self.sqrt_primes = list(sieve(max_int))
+        self.sqrt_primes = primes_upto(max_int)
         if self.debug:
             print("Finished Calculating Primes")
 

solutions/PE123.py

@@ -7,16 +7,14 @@
 For example, when n = 3, p_3 = 5, and 4^3 + 6^3 = 280 ≡ 5 mod 25.
 
 The least value of n for which the remainder first exceeds 10^9 is 7037.
-
 Find the least value of n for which the remainder first exceeds 10^10.
 
 ANSWER: 21035
-Solve time ~ ms
+Solve time ~850 ms
 """
 
-from util.utils import timeit
+from util.utils import timeit, primes_upto
 import unittest
-from primesieve import primes, nth_prime
 
 # r = (p_{n} − 1)^n + (p_{n} + 1)^n
 # r = sum_{i=0}^{n} p_{n}^i (1 + (-1)^(n-i)) * (n choose i)
@@ -34,10 +32,12 @@ def __init__(self, limit):
 
     @timeit
     def solve(self):
+        ls_primes = primes_upto(int(1e6))
         for n in range(1, 100000, 2):
-            r = n * nth_prime(n) * 2
+            r = n * ls_primes[n-1] * 2
             if r >= self.limit:
                 return n
+        return 0
 
 
 class Solution123(unittest.TestCase):

solutions/PE131.py

@@ -14,9 +14,8 @@
 ANSWER: 173
 Solve time: ~1 second
 """
-from util.utils import timeit
+from util.utils import timeit, primes_upto
 import unittest
-from primesieve import primes
 
 # n^2 * (n+p) = m^3  -> therefore n+p must be a perfect cube and n must be a perfect cube
 # therefore p = perfect cube (m^3) - n (perfect cube)
@@ -32,7 +31,7 @@ def __init__(self, max_p=1_000_000):
 
     @timeit
     def solve(self):
-        ls_primes = primes(self.max_p)
+        ls_primes = primes_upto(self.max_p)
         count = 0
         p, q = 1, 0
         while p <= self.max_p:

solutions/PE132.py

@@ -12,7 +12,7 @@
 """
 from util.utils import timeit
 import unittest
-from primesieve import primes
+from util.utils import primes_upto as primes
 
 
 # R(n) = (10^n - 1) / 9
@@ -31,7 +31,7 @@ def solve(self, n=pow(10, 9), max_count=40, max_prime=200000):
         count = 0
         ls_primes = primes(max_prime)
         for p in ls_primes:
-            if pow(10, n, 9 * p) == 1:
+            if pow(10, n, int(9 * p)) == 1:
                 count += 1
                 ans += p
             if count == max_count:

solutions/PE187.py

@@ -11,9 +11,8 @@
 Solve time: ~ 0.04 seconds
 """
 
-from primesieve import primes, count_primes
 import unittest
-from util.utils import timeit
+from util.utils import timeit, primes_upto, count_primes_upto
 
 
 class Problem187:
@@ -23,11 +22,11 @@ def __init__(self, n):
     @timeit
     def solve(self):
         """pi(n/q) - pi(q) + 1 for all prime q not greater than sqrt(n)"""
-        ls_p = primes(self.n ** 0.5)
+        ls_p = primes_upto(self.n ** 0.5)
 
         count = 0
         for p in ls_p:
-            count += count_primes(self.n / p) - count_primes(p) + 1
+            count += count_primes_upto(self.n / p) - count_primes_upto(p) + 1
 
         return count
 

solutions/PE193.py

@@ -14,7 +14,7 @@
   http://www.numericana.com/answer/numbers.htm#moebius
   https://arxiv.org/pdf/1107.4890.pdf
 """
-from primesieve import primes
+from util.utils import primes_upto as primes
 
 import unittest
 from util.utils import timeit, mobius_sieve
@@ -67,7 +67,7 @@ def solve_inclusion_exclusion(self):  # 23 seconds
         self.limit = self.n - 1
         self.total = self.n - 1
         self.ls_primes = primes((self.n ** 0.5) + 1)
-        self.ls_sq_primes = [p * p for p in self.ls_primes]
+        self.ls_sq_primes = [int(p * p) for p in self.ls_primes]
         self.num_primes = len(self.ls_primes)
         self.inclusion_exclusion_helper(odd_even=-1, prev_prod=1, prime_index=0, next_prod=4)
         return self.total