diff --git a/src/main/scala/com/nsrddyn/cpu/ALU/Hash.scala b/src/main/scala/com/nsrddyn/ALU/Hash.scala similarity index 100% rename from src/main/scala/com/nsrddyn/cpu/ALU/Hash.scala rename to src/main/scala/com/nsrddyn/ALU/Hash.scala diff --git a/src/main/scala/com/nsrddyn/cpu/ALU/Prime.scala b/src/main/scala/com/nsrddyn/ALU/Prime.scala similarity index 54% rename from src/main/scala/com/nsrddyn/cpu/ALU/Prime.scala rename to src/main/scala/com/nsrddyn/ALU/Prime.scala index effedef..343dcee 100644 --- a/src/main/scala/com/nsrddyn/cpu/ALU/Prime.scala +++ b/src/main/scala/com/nsrddyn/ALU/Prime.scala @@ -3,7 +3,7 @@ package com.nsrddyn.alu import com.nsrddyn.tools.Benchmark -class Prime() extends Benchmark: +class Prime() extends Benchmark { /* * Calculate all primes up to limit @@ -20,26 +20,22 @@ class Prime() extends Benchmark: /* - * TODO: I did the countrary of what i wanted to accieve with the is prime function - * We want the function to be less optimized so that the CPU has more work == more stress - */ + * TODO: I did the countrary of what i wanted to accieve with the is prime function + * We want the function to be less optimized so that the CPU has more work == more stress + */ def isPrime(n: Int): Boolean = { - val start = measure() if n <= 1 then false else !(2 to math.sqrt(n).toInt).exists(i => n % i == 0) } - def run(n: Int): Unit = for i <- 0 to n do isPrime(i) + def run(n: Int, result: Boolean): Unit = { + + for i <- 0 to n do if isPrime(i) == result then println("true") else println("false") + + } - // TODO: implement measure methode to measure the time that it takes to find that prime number - def measure(): Long ={ - - val start = System.nanoTime() - System.nanoTime() - val end = System.nanoTime() - start - end - } +} diff --git a/src/main/scala/com/nsrddyn/Enums/Status.scala b/src/main/scala/com/nsrddyn/Enums/Status.scala new file mode 100644 index 0000000..79b140c --- /dev/null +++ b/src/main/scala/com/nsrddyn/Enums/Status.scala @@ -0,0 +1,6 @@ +package com.nsrddyn.Enums + +enum Status: + case PASS + case FAIL + diff --git a/src/main/scala/com/nsrddyn/cpu/FPU/CholeskyDecomposition.scala b/src/main/scala/com/nsrddyn/FPU/CholeskyDecomposition.scala similarity index 99% rename from src/main/scala/com/nsrddyn/cpu/FPU/CholeskyDecomposition.scala rename to src/main/scala/com/nsrddyn/FPU/CholeskyDecomposition.scala index 79325f4..b42ade9 100644 --- a/src/main/scala/com/nsrddyn/cpu/FPU/CholeskyDecomposition.scala +++ b/src/main/scala/com/nsrddyn/FPU/CholeskyDecomposition.scala @@ -23,6 +23,4 @@ class CholeskyDecomposition { } } - - } diff --git a/src/main/scala/com/nsrddyn/cpu/FPU/FPU.scala b/src/main/scala/com/nsrddyn/FPU/FPU.scala similarity index 100% rename from src/main/scala/com/nsrddyn/cpu/FPU/FPU.scala rename to src/main/scala/com/nsrddyn/FPU/FPU.scala diff --git a/src/main/scala/com/nsrddyn/cpu/FPU/Matrix.scala b/src/main/scala/com/nsrddyn/FPU/Matrix.scala similarity index 100% rename from src/main/scala/com/nsrddyn/cpu/FPU/Matrix.scala rename to src/main/scala/com/nsrddyn/FPU/Matrix.scala diff --git a/src/main/scala/com/nsrddyn/Main.scala b/src/main/scala/com/nsrddyn/Main.scala index aedad3c..de4fa1b 100644 --- a/src/main/scala/com/nsrddyn/Main.scala +++ b/src/main/scala/com/nsrddyn/Main.scala @@ -8,19 +8,9 @@ object Torque { @main def main(args: String*): Unit = - val pr = new Prime() - val br = new Benchmark() - // ANSI ESCAPE CODE: clear screen println("\u001b[2J\u001b[H") println("--- TORQUE STRESS TESTING UTILITY ---") - // val value = 2147483647 - val value = 200000 - - val time = br.measure(pr.run(value)) - println(time) - -} - + }