v3.0

MitchellShibilski-Unkel · Dec 22, 2023 · 5f46aa7 · 5f46aa7
1 parent 09217af
commit 5f46aa7
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 14 deletions.
diff --git a/Algorthmic Tests/primeCounter.py b/Algorthmic Tests/primeCounter.py
@@ -0,0 +1,67 @@
+import time
+import numpy as np
+
+
+# --- Prime Function --- #
+primeList = []
+def primeCounter(countUpTo):
+    list = [x for x in range(0,countUpTo)]
+
+    # Get the value in the list
+    for i in range(len(list)):
+        # From 2 to the value, check to see if it is a prime; if the remainder is zero, not a prime; else, append prime number to the primeList
+        for k in range(2, i):
+            if i % k == 0:
+                break
+        else:
+            primeList.append(i)
+
+    print(primeList)
+
+# --- Primes to 100 --- #
+# Start timer
+startTimer = time.perf_counter()
+startTimer2 = time.process_time()
+
+primeCounter(101)
+
+endTimer = time.perf_counter()
+endTimer2 = time.process_time()
+
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
+
+# --- Primes to 1000 --- #
+# Start timer
+startTimer = time.perf_counter()
+startTimer2 = time.process_time()
+
+primeCounter(1001)
+
+endTimer = time.perf_counter()
+endTimer2 = time.process_time()
+
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
+
+# --- Primes to 10000 --- #
+# Start timer
+startTimer = time.perf_counter()
+startTimer2 = time.process_time()
+
+primeCounter(10001)
+
+endTimer = time.perf_counter()
+endTimer2 = time.process_time()
+
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
+
+# --- Primes to 1000000 --- #
+# Start timer
+startTimer = time.perf_counter()
+startTimer2 = time.process_time()
+
+primeCounter(1000001)
+
+endTimer = time.perf_counter()
+endTimer2 = time.process_time()
+
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Algorthmic Tests/waveFunction.py b/Algorthmic Tests/waveFunction.py
@@ -27,12 +27,12 @@ def waveFunc(loopNum):
         step2 = float((i * h) * (2 / 2 * t))
 
         # Get the final value
-        print(f"SE: {step1 - step2}\n")
+        print(f"SE: {step1 - step2}s\n")
 
 # Run the function with a specific amount of times it will have to repeat the loop
 waveFunc(None)
 
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/addTest.py b/Simple Tests/addTest.py
@@ -18,4 +18,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/allBasicMath.py b/Simple Tests/allBasicMath.py
@@ -31,4 +31,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/divideTest.py b/Simple Tests/divideTest.py
@@ -21,4 +21,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/forBreakTest.py b/Simple Tests/forBreakTest.py
@@ -26,4 +26,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/forTest.py b/Simple Tests/forTest.py
@@ -19,4 +19,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/input.py b/Simple Tests/input.py
@@ -14,4 +14,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/mulitplyTest.py b/Simple Tests/mulitplyTest.py
@@ -18,4 +18,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Simple Tests/subText.py b/Simple Tests/subText.py
@@ -21,4 +21,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Sorting Tests/bubbleSort.py b/Sorting Tests/bubbleSort.py
@@ -14,4 +14,4 @@
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Sorting Tests/greatestAndLeastSort.py b/Sorting Tests/greatestAndLeastSort.py
@@ -49,4 +49,4 @@ def mergeSort(array = []):
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Sorting Tests/mergeSort.py b/Sorting Tests/mergeSort.py
@@ -47,4 +47,4 @@ def mergeSort(array = []):
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")
diff --git a/Sorting Tests/selectionSort.py b/Sorting Tests/selectionSort.py
@@ -23,4 +23,4 @@ def selectionSort(array = []):
 endTimer = time.perf_counter()
 endTimer2 = time.process_time()
 
-print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}")
+print(f"Task Finished In Performance: {endTimer - startTimer:0.8f}s\nTask Finished In Process/CPU/Kernel + User Space: {endTimer2 - startTimer2:0.8f}s")