testing

pom.xml

@@ -19,6 +19,12 @@
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

src/main/java/PrimerFinder/PrimerFinder.java → src/main/java/fiftyShadesOfMultiThreading/PrimerFinder/PrimerFinder.java

-package PrimerFinder;
+package fiftyShadesOfMultiThreading.PrimerFinder;
 
 import java.util.List;
 

src/main/java/SequentialCounter.java → src/main/java/fiftyShadesOfMultiThreading/SequentialCounter.java

-import PrimerFinder.PrimerFinder;
+package fiftyShadesOfMultiThreading;
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/SequentialSummer.java → src/main/java/fiftyShadesOfMultiThreading/SequentialSummer.java

-import PrimerFinder.PrimerFinder;
+package fiftyShadesOfMultiThreading;
 
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/counters/Counter.java → src/main/java/fiftyShadesOfMultiThreading/counters/Counter.java

-package counters;
+package  fiftyShadesOfMultiThreading.counters;
 
 
-import worker.WorkPartitioner.Part;
-import worker.Worker;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.Worker;
 
 
 public class Counter extends Worker {

src/main/java/counters/CounterCallable.java → src/main/java/fiftyShadesOfMultiThreading/counters/CounterCallable.java

-package counters;
-import PrimerFinder.PrimerFinder;
-import worker.WorkPartitioner.Part;
+package fiftyShadesOfMultiThreading.counters;
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/counters/CounterRunnable.java → src/main/java/fiftyShadesOfMultiThreading/counters/CounterRunnable.java

-package counters;
+package fiftyShadesOfMultiThreading.counters;
 
-import PrimerFinder.PrimerFinder;
-import summers.Summer;
-import worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,7 +9,7 @@ import java.util.List;
 public class CounterRunnable extends Counter implements Runnable{
     private Thread thread;
 
-    public CounterRunnable(int[] data, WorkPartitioner.Part part) {
+    public CounterRunnable(int[] data, Part part) {
         super(data, part);
     }
 

src/main/java/counters/CounterThread.java → src/main/java/fiftyShadesOfMultiThreading/counters/CounterThread.java

-package counters;
+package fiftyShadesOfMultiThreading.counters;
 import java.util.ArrayList;
 import java.util.List;
 
 
-import PrimerFinder.PrimerFinder;
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 public class CounterThread extends Thread{
 	private int start;

src/main/java/data/TestData.java → src/main/java/fiftyShadesOfMultiThreading/data/TestData.java

-package data;
+package fiftyShadesOfMultiThreading.data;
 
 public class TestData {
 

src/main/java/main.java → src/main/java/fiftyShadesOfMultiThreading/main.java

-import data.TestData;
-import parallelCounters.*;
-import parallelSummers.*;
+package fiftyShadesOfMultiThreading;
+
+import fiftyShadesOfMultiThreading.data.TestData;
+import fiftyShadesOfMultiThreading.parallelCounters.*;
+import fiftyShadesOfMultiThreading.parallelSummers.*;
+
 
 public class main {
     public static void main(String[] args) {
@@ -16,13 +19,13 @@ public class main {
         System.out.println("Parallel Counter 4: " + ParallelCounter3.primesCount(data, threadCount));
         System.out.println("Parallel Counter 4: " + ParallelCounter4.primesCount(data, threadCount));
 
-        /*long summerResult = SequentialSummer.sum(data);
+        long summerResult = SequentialSummer.sum(data);
         System.out.println("Sequential Summer:" + summerResult);
         System.out.println("Parallel Summer 1: " + ParallelSummer0.sum(data, threadCount));
         System.out.println("Parallel Summer 2: " + ParallelSummer1.sum(data, threadCount));
         System.out.println("Parallel Summer 3: " + ParallelSummer2.sum(data, threadCount));
         System.out.println("Parallel Summer 4: " + ParallelSummer3.sum(data, threadCount));
-        System.out.println("Parallel Summer 4: " + ParallelSummer4.sum(data, threadCount));*/
+        System.out.println("Parallel Summer 4: " + ParallelSummer4.sum(data, threadCount));
 
     }
 }

src/main/java/parallelCounters/ParallelCounter0.java → src/main/java/fiftyShadesOfMultiThreading/parallelCounters/ParallelCounter0.java

-package parallelCounters;
+package fiftyShadesOfMultiThreading.parallelCounters;
 
 
 import java.util.ArrayList;
@@ -8,11 +8,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 
-import PrimerFinder.PrimerFinder;
-import counters.CounterThread;
-import summers.SummerThread;
-import worker.WorkPartitioner;
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.PrimerFinder.PrimerFinder;
+import fiftyShadesOfMultiThreading.counters.CounterThread;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 //this class calculates the number of primes in [0 , size-1] using CounterThread
 

src/main/java/parallelCounters/ParallelCounter1.java → src/main/java/fiftyShadesOfMultiThreading/parallelCounters/ParallelCounter1.java

-package parallelCounters;
-
-import counters.CounterRunnable;
-import counters.CounterThread;
-import summers.SummerRunnable;
-import worker.WorkPartitioner;
+package fiftyShadesOfMultiThreading.parallelCounters;
 
+import fiftyShadesOfMultiThreading.counters.CounterRunnable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,10 +16,10 @@ public class ParallelCounter1 {
         List<CounterRunnable> counters =  new ArrayList<>();
 
         //partitioning the data to assign each part to a counter to calculate the number of primes
-        List<WorkPartitioner.Part> parts =  WorkPartitioner.partitions(data.length, threadCount);
+        List<Part> parts =  WorkPartitioner.partitions(data.length, threadCount);
 
         //assigning each part to counter runnable
-        for (WorkPartitioner.Part part : parts) {
+        for (Part part : parts) {
             counters.add(new CounterRunnable(data,part));
         }
 

src/main/java/parallelCounters/ParallelCounter2.java → src/main/java/fiftyShadesOfMultiThreading/parallelCounters/ParallelCounter2.java

-package parallelCounters;
+package fiftyShadesOfMultiThreading.parallelCounters;
 
 
-import counters.CounterRunnable;
-import counters.CounterThread;
-import summers.SummerThread;
-import worker.WorkPartitioner;
-import worker.WorkPartitioner.Part;
+
+import fiftyShadesOfMultiThreading.counters.CounterThread;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/parallelCounters/ParallelCounter3.java → src/main/java/fiftyShadesOfMultiThreading/parallelCounters/ParallelCounter3.java

-package parallelCounters;
-import counters.CounterCallable;
-import summers.SummerCallable;
-import worker.WorkPartitioner;
+package fiftyShadesOfMultiThreading.parallelCounters;
+
+import fiftyShadesOfMultiThreading.counters.CounterCallable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,7 +10,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 //this class calculates the number of primes in [0 , size-1]
 // using ExecutorService with fixed thread pool of threadCount threads,

src/main/java/parallelCounters/ParallelCounter4.java → src/main/java/fiftyShadesOfMultiThreading/parallelCounters/ParallelCounter4.java

-package parallelCounters;
-import counters.CounterCallable;
-import summers.SummerCallable;
-import worker.WorkPartitioner;
-import worker.WorkPartitioner.Part;
+package fiftyShadesOfMultiThreading.parallelCounters;
+import fiftyShadesOfMultiThreading.counters.CounterCallable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/parallelSummers/ParallelSummer0.java → src/main/java/fiftyShadesOfMultiThreading/parallelSummers/ParallelSummer0.java

-package parallelSummers;
+package fiftyShadesOfMultiThreading.parallelSummers;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-import counters.CounterThread;
-import summers.SummerThread;
-import worker.WorkPartitioner;
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.summers.SummerThread;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 
 public class ParallelSummer0 {
 
-	public static long primesCount(int[] data, int threadCount) {
-
-		List<CounterThread> counters =  new ArrayList<>();
-		List<Part> parts =  WorkPartitioner.partitions(data.length, threadCount);
-		for (Part part : parts) {
-			counters.add(new CounterThread(data,part));
-		}
-		for (CounterThread counterThread : counters) {
-			counterThread.start();
-		}
-
-		for (CounterThread counterThread : counters) {
-			try {
-				counterThread.join();
-			} catch (InterruptedException e) {
-				System.err.println("Thread cannot join!");
-			}
-		}
-
-		int count = 0;
-		for (CounterThread counterThread : counters) {
-			count += counterThread.getCount();
-		}
-
-		return count;
-	}
-
 	public static long sum(int[] data, int threadCount) {
 		
 		List<SummerThread> summers =  new ArrayList<>();

src/main/java/parallelSummers/ParallelSummer1.java → src/main/java/fiftyShadesOfMultiThreading/parallelSummers/ParallelSummer1.java

-package parallelSummers;
+package fiftyShadesOfMultiThreading.parallelSummers;
 
-import summers.SummerRunnable;
-import worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.summers.SummerRunnable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,9 +15,9 @@ public class ParallelSummer1 {
 	public static long sum(int[] data, int threadCount) {
 		
 		List<SummerRunnable> summers =  new ArrayList<>();
-		List<WorkPartitioner.Part> parts =  WorkPartitioner.partitions(data.length, threadCount);
+		List<Part> parts =  WorkPartitioner.partitions(data.length, threadCount);
 		
-		for (WorkPartitioner.Part part : parts) {
+		for (Part part : parts) {
 			summers.add(new SummerRunnable(data,part));
 		}
 		

src/main/java/parallelSummers/ParallelSummer2.java → src/main/java/fiftyShadesOfMultiThreading/parallelSummers/ParallelSummer2.java

-package parallelSummers;
+package fiftyShadesOfMultiThreading.parallelSummers;
 
 
-import summers.SummerThread;
-import worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.summers.SummerThread;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/parallelSummers/ParallelSummer3.java → src/main/java/fiftyShadesOfMultiThreading/parallelSummers/ParallelSummer3.java

-package parallelSummers;
-import summers.SummerCallable;
-import worker.WorkPartitioner;
+package fiftyShadesOfMultiThreading.parallelSummers;
+import fiftyShadesOfMultiThreading.summers.SummerCallable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 
 public class ParallelSummer3 {

src/main/java/parallelSummers/ParallelSummer4.java → src/main/java/fiftyShadesOfMultiThreading/parallelSummers/ParallelSummer4.java

-package parallelSummers;
-import summers.SummerCallable;
-import worker.WorkPartitioner;
-import worker.WorkPartitioner.Part;
+package fiftyShadesOfMultiThreading.parallelSummers;
+import fiftyShadesOfMultiThreading.summers.SummerCallable;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/summers/Summer.java → src/main/java/fiftyShadesOfMultiThreading/summers/Summer.java

-package summers;
+package fiftyShadesOfMultiThreading.summers;
 
-import worker.WorkPartitioner;
-import worker.Worker;
 
-public class Summer extends Worker{
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.Worker;
+
+public class Summer extends Worker {
 
         protected long sum;
-        public Summer(int[] data, WorkPartitioner.Part part) {
+        public Summer(int[] data, Part part) {
             super(data, part);
         }
         public long getSum() {

src/main/java/summers/SummerCallable.java → src/main/java/fiftyShadesOfMultiThreading/summers/SummerCallable.java

-package summers;
+package fiftyShadesOfMultiThreading.summers;
 
-import counters.Counter;
-import worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.counters.Counter;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
 
 import java.util.concurrent.Callable;
 

src/main/java/summers/SummerRunnable.java → src/main/java/fiftyShadesOfMultiThreading/summers/SummerRunnable.java

-package summers;
+package fiftyShadesOfMultiThreading.summers;
 
 import java.util.concurrent.Callable;
 
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 
 public class SummerRunnable extends Summer implements Runnable{

src/main/java/summers/SummerThread.java → src/main/java/fiftyShadesOfMultiThreading/summers/SummerThread.java

-package summers;
+package fiftyShadesOfMultiThreading.summers;
 import java.util.ArrayList;
 import java.util.List;
 
 
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 public class SummerThread extends Thread{
     private int start;

src/main/java/worker/WorkPartitioner.java → src/main/java/fiftyShadesOfMultiThreading/worker/WorkPartitioner.java

-package worker;
+package fiftyShadesOfMultiThreading.worker;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/worker/Worker.java → src/main/java/fiftyShadesOfMultiThreading/worker/Worker.java

-package worker;
+package fiftyShadesOfMultiThreading.worker;
 
-import worker.WorkPartitioner.Part;
+import fiftyShadesOfMultiThreading.worker.WorkPartitioner.Part;
 
 
 public abstract class Worker {

src/test/java/fiftyShadesOfMultiThreading/TestParallelCounter.java

+package fiftyShadesOfMultiThreading;
+import fiftyShadesOfMultiThreading.data.TestData;
+import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import fiftyShadesOfMultiThreading.parallelCounters.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
+
+/*import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;*/
+
+
+    public class TestParallelCounter {
+        private static int size;
+        private static int[] data;
+        private static long result;
+
+        @BeforeAll
+        public static void initialize() {
+            size = 1000000;
+            data = TestData.createData(size);
+            result = SequentialCounter.primesCount(data);
+        }
+
+        private static void testAll(int threadCount) {
+            assertEquals(result, ParallelCounter0.primesCount(data,threadCount));
+            assertEquals(result, ParallelCounter1.primesCount(data,threadCount));
+            assertEquals(result, ParallelCounter2.primesCount(data,threadCount));
+            assertEquals(result, ParallelCounter3.primesCount(data,threadCount));
+            assertEquals(result, ParallelCounter4.primesCount(data,threadCount));
+        }
+
+        @Test
+        public void testSingleThread() {
+            testAll(1);
+        }
+
+        @Test
+        public void testTwoThread() {
+            testAll(2);
+        }
+
+        @Test
+        public void testFourThread() {
+            testAll(4);
+        }
+
+        @Test
+        public void testEightThread() {
+            testAll(8);
+        }
+
+        @Test
+        public void testSixteenThread() {
+            testAll(16);
+        }
+
+
+    }
+