Rename files

Author: mwoss

src/main/java/ActiveObject/App/Main.java

@@ -1,27 +1,23 @@
 package ActiveObject.App;
-
 import ActiveObject.Models.Consumer;
 import ActiveObject.Models.Producer;
 import ActiveObject.Proxy;
 import ActiveObject.TimerRunnable;
-
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 public class Main {
     public static void main(String[] args) throws FileNotFoundException, InterruptedException {
-        PrintStream out = new PrintStream(new FileOutputStream("new_outputAO_sleep" + 1000 + ".txt"));
+        PrintStream out = new PrintStream(new FileOutputStream("outputAO_sleep_thread" + 2 + ".txt"));
         System.setOut(out);
-        final int N = 100;
-        final int capacity = 10000;
+        final int N = 2;
+        final int capacity = 5000;
         List<Thread> prodList = new ArrayList<>();
         List<Thread> consList = new ArrayList<>();
         Proxy proxy = new Proxy(capacity);

src/main/java/ActiveObject/Models/Consumer.java

@@ -29,7 +29,7 @@ public void run() {
             taskList.add(proxy.consume(random.nextInt(bufferLimit / 2) + 1));
 
             try{
-                Thread.sleep(1000); //give him some time to finish job
+                Thread.sleep(500); //give him some time to finish job
                 for(Iterator<Future> iterator = taskList.iterator(); iterator.hasNext();){
                     Future task = iterator.next();
                     if(task.isFinished()){

src/main/java/ActiveObject/Models/Producer.java

@@ -29,7 +29,7 @@ public void run() {
             taskList.add(proxy.produce(random.nextInt(bufferLimit / 2) + 1));
 
             try{
-                Thread.sleep(1000); //give him some time to finish job
+                Thread.sleep(500); //give him some time to finish job
                 for(Iterator<Future> iterator = taskList.iterator(); iterator.hasNext();){
                     Future task = iterator.next();
                     if(task.isFinished()){

src/main/java/AsyncPC/App/MainQ2.java renamed to src/main/java/AsyncPC/App/MainFinal.java

@@ -1,9 +1,9 @@
 package AsyncPC.App;
 
-import AsyncPC.Logic.Models.SecSolutionBetter.ConsumerQ2;
-import AsyncPC.Logic.Models.SecSolutionBetter.ProducerQ2;
-import AsyncPC.Logic.Utils.SecSolutionBetter.Buffer;
-import AsyncPC.Logic.Utils.SecSolutionBetter.PCMonitorAsyncQueue2;
+import AsyncPC.Logic.Models.FinalSolution.ConsumerQ2;
+import AsyncPC.Logic.Models.FinalSolution.ProducerQ2;
+import AsyncPC.Logic.Utils.FinalSolution.Buffer;
+import AsyncPC.Logic.Utils.FinalSolution.PCMonitorAsyncQueue2;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -14,13 +14,13 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-public class MainQ2 {
+public class MainFinal {
 
     public static void main(String[] args) throws FileNotFoundException {
-        PrintStream out = new PrintStream(new FileOutputStream("new_outputAsync_sleep" + 1000 + ".txt"));
+        PrintStream out = new PrintStream(new FileOutputStream("outputAsync_sleep_thread" + 2 + ".txt"));
         System.setOut(out);
-        int capacity = 10000;
-        int threadAmount = 100;
+        int capacity = 5000;
+        int threadAmount = 2;
         List<Thread> prodList = new ArrayList<>();
         List<Thread> consList = new ArrayList<>();
         PCMonitorAsyncQueue2 pcMonitorAsync = new PCMonitorAsyncQueue2(capacity);

src/main/java/AsyncPC/App/Main.java renamed to src/main/java/AsyncPC/App/MainFst.java

@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class Main {
+public class MainFst {
     public static void main(String[] args) {
         final int capacity = 50;
         final int producerAmount = 10;

src/main/java/AsyncPC/App/MainQ.java renamed to src/main/java/AsyncPC/App/MainSec.java

@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class MainQ {
+public class MainSec {
     public static void main(String[] args) {
         int capacity = 100;
         int threadAmount = 10;

src/main/java/AsyncPC/App/TimerRunnableAsync.java

@@ -1,6 +1,6 @@
 package AsyncPC.App;
 
-import AsyncPC.Logic.Utils.SecSolutionBetter.PCMonitorAsyncQueue2;
+import AsyncPC.Logic.Utils.FinalSolution.PCMonitorAsyncQueue2;
 
 public class TimerRunnableAsync implements Runnable {
     private PCMonitorAsyncQueue2 monitor;

src/main/java/AsyncPC/Logic/Models/SecSolutionBetter/ConsumerQ2.java renamed to src/main/java/AsyncPC/Logic/Models/FinalSolution/ConsumerQ2.java

@@ -1,7 +1,7 @@
-package AsyncPC.Logic.Models.SecSolutionBetter;
+package AsyncPC.Logic.Models.FinalSolution;
 
-import AsyncPC.Logic.Utils.SecSolutionBetter.Buffer;
-import AsyncPC.Logic.Utils.SecSolutionBetter.PCMonitorAsyncQueue2;
+import AsyncPC.Logic.Utils.FinalSolution.Buffer;
+import AsyncPC.Logic.Utils.FinalSolution.PCMonitorAsyncQueue2;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -32,7 +32,7 @@ public void run() {
                 for(Integer element : elementsToConsume)
                     this.buffer.takeElement(element);
                 this.pcMonitorAsyncQueue.takeFromEnd(elementsToConsume);
-                Thread.sleep(1000);
+                Thread.sleep(500);
             }catch (InterruptedException e){
                 e.printStackTrace();
             }

src/main/java/AsyncPC/Logic/Models/SecSolutionBetter/ProducerQ2.java renamed to src/main/java/AsyncPC/Logic/Models/FinalSolution/ProducerQ2.java

@@ -1,7 +1,7 @@
-package AsyncPC.Logic.Models.SecSolutionBetter;
+package AsyncPC.Logic.Models.FinalSolution;
 
-import AsyncPC.Logic.Utils.SecSolutionBetter.Buffer;
-import AsyncPC.Logic.Utils.SecSolutionBetter.PCMonitorAsyncQueue2;
+import AsyncPC.Logic.Utils.FinalSolution.Buffer;
+import AsyncPC.Logic.Utils.FinalSolution.PCMonitorAsyncQueue2;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -32,7 +32,7 @@ public void run() {
                 for(Integer element : elementsToProduce)
                     this.buffer.setElement(random.nextInt(this.buferLimit / 2) + 1, element);
                 this.pcMonitorAsyncQueue.insertOnEnd(elementsToProduce);
-                Thread.sleep(1000);
+                Thread.sleep(500);
             }catch (InterruptedException e){
                 e.printStackTrace();
             }

src/main/java/AsyncPC/Logic/Utils/SecSolutionBetter/Buffer.java renamed to src/main/java/AsyncPC/Logic/Utils/FinalSolution/Buffer.java

@@ -1,4 +1,4 @@
-package AsyncPC.Logic.Utils.SecSolutionBetter;
+package AsyncPC.Logic.Utils.FinalSolution;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/AsyncPC/Logic/Utils/SecSolutionBetter/PCMonitorAsyncQueue2.java renamed to src/main/java/AsyncPC/Logic/Utils/FinalSolution/PCMonitorAsyncQueue2.java

@@ -1,4 +1,4 @@
-package AsyncPC.Logic.Utils.SecSolutionBetter;
+package AsyncPC.Logic.Utils.FinalSolution;
 
 import java.util.ArrayList;
 import java.util.Queue;