no longer printing solutions to cmd

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.RecursiveTask;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -80,9 +79,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	 * Fuer die Threads
 	 */
 	UnifyResultModel urm;
+	protected static int noOfThread = 0;
 	private static int totalnoOfThread = 0;
 	int thNo;
 	protected boolean one = false;
+	Integer MaxNoOfThreads = 128;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
 	Writer logFile;
@@ -183,7 +184,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
-
+			
+			noOfThread++; 
 			totalnoOfThread++;
 			//writeLog("thNo1 " + thNo);
 			thNo = totalnoOfThread;
@@ -272,6 +274,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				.filter(x -> x.size()>1)
 				.collect(Collectors.toCollection(ArrayList::new));
 		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField, new HashSet<>());
+		noOfThread--;
 		try {
 			logFile.close();
 		}
@@ -926,7 +929,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			/* Wenn parallel gearbeitet wird, wird je nach Varianz ein neuer Thread
 			 * gestartet, der parallel weiterarbeitet.
 			 */
-			if(parallel && (variance == 1)) {
+			if(parallel && (variance == 1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -986,6 +989,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1005,6 +1009,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -1026,7 +1031,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 			} else {
-			if(parallel && (variance == -1)) {
+			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -1085,6 +1090,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1104,6 +1110,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -1125,7 +1132,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 		    } else {
-		    if(parallel && (variance == 2)) {
+		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
 		    	writeLog("var2einstieg");
 		    	Set<TypeUnify2Task> forks = new HashSet<>();
 		    	Set<UnifyPair> newEqOrig = new HashSet<>(eq);
@@ -1169,6 +1176,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	/* FORK ANFANG */
 		    	synchronized (this) {
 		    		writeLog("wait "+ forkOrig.thNo);
+		    		noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1187,6 +1195,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
 		    	for(TypeUnify2Task fork : forks) {
 		    		synchronized (this) {
+		    			noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -2608,6 +2617,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if (log && finalresult) {
 			try {
 				logFile.write("Thread no.:" + thNo + "\n");
+				logFile.write("noOfThread:" + noOfThread + "\n");
 				logFile.write("parallel:" + parallel + "\n");
 				logFile.write(str+"\n\n");
 				logFile.flush();

src/test/java/typeinference/UnifyTest.java

@@ -95,7 +95,7 @@ public class UnifyTest {
         UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
-        System.out.println(solution);
+        //System.out.println(solution);
     }
     /*
     @Test