Merge branch 'performanceTestBase' into performanceTestRecursionOptimization

added option for printing out calculated solution in file
implemented ConstraintSetRepository
2024-05-02 15:56:46 +02:00 · 2024-05-02 15:56:03 +02:00 · 2024-05-01 20:05:28 +02:00 · 2024-05-01 19:42:24 +02:00 · 2024-04-26 12:51:00 +02:00 · 2024-04-26 12:50:44 +02:00
6 changed files with 84 additions and 391 deletions
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/ConstraintSetRepository.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/ConstraintSetRepository.java
@@ -0,0 +1,21 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ConstraintSetRepository {
+    private Set<Integer> sets = new HashSet<>();
+
+    public boolean containsSet(Set<Set<UnifyPair>> set){
+        Integer hash = Integer.valueOf(set.hashCode());
+
+        if(sets.contains(hash)){
+            return true;
+        }else{
+            sets.add(hash);
+            return false;
+        }
+    }
+}
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
@@ -29,7 +29,7 @@ public class TypeUnify {
 	 * @return
 	 */
 	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, new ConstraintSetRepository());
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -55,7 +55,7 @@ public class TypeUnify {
 	 * @return
 	 */
 	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, new ConstraintSetRepository());
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		pool.invoke(unifyTask);
 		return ret;
@@ -74,7 +74,7 @@ public class TypeUnify {
 	 */
 	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
 		TypeUnifyTask unifyTask = //new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, new ConstraintSetRepository(), statistics);
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -109,7 +109,7 @@ public class TypeUnify {
 	 * @return
 	 */
 	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks, new ConstraintSetRepository());
 		unifyTask.statistics = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
@@ -24,13 +24,13 @@ public class TypeUnify2Task extends TypeUnifyTask {
    		   List<Set<Constraint<UnifyPair>>> oderConstraints, 
    		   Set<UnifyPair> nextSetElement, 
    		   IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, 
-    		   Set<UnifyPair> methodSignatureConstraintUebergabe, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe );
+    		   Set<UnifyPair> methodSignatureConstraintUebergabe, ConstraintSetRepository constraintSetRepository, Writer statistics) {
+    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe, constraintSetRepository);
    	   
       }
       
-       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe, ConstraintSetRepository constraintSetRepository) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, constraintSetRepository);
               this.setToFlatten = setToFlatten;
               this.nextSetElement = nextSetElement;
               this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -46,7 +46,11 @@ public class TypeUnify2Task extends TypeUnifyTask {
                       System.out.println("two");
               }
               one = true;
-               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, methodSignatureConstraintUebergabe);
+           Set<Set<UnifyPair>> res = new HashSet<>();
+
+           if(!constraintSetRepository.containsSet(setToFlatten)){
+               res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, methodSignatureConstraintUebergabe);
+           }
               /*if (isUndefinedPairSetSet(res)) { 
                       return new HashSet<>(); }
               else
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -130,6 +130,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	volatile UnifyTaskModel usedTasks;
 	
 	static Writer statistics;
+	protected ConstraintSetRepository constraintSetRepository;
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -150,11 +151,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	*/
 	
 	//statistics
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Writer statistics) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, ConstraintSetRepository constraintSetRepository, Writer statistics) {
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks, constraintSetRepository);
 		this.statistics = statistics;
 	}
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, ConstraintSetRepository constraintSetRepository) {
 		synchronized (this) {
            if(statistics==null){
                statistics = new NullWriter();
@@ -209,6 +210,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.urm = urm;
 			this.usedTasks = usedTasks;
 			this.usedTasks.add(this);
+			this.constraintSetRepository = constraintSetRepository;
 		}
 	}
 	
@@ -685,15 +687,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			System.out.print("");
 		}
 		*/
-		Set<Set<UnifyPair>> result = new HashSet<>(); 
-		int variance = 0;
-		
-		/* Varianzbestimmung Anfang 
-		 * Oderconstraint, wenn entweder kein Basepair oder unterschiedliche Basepairs => oderConstraint = true;
-		 * Varianz = 1 => Argumentvariable
-		 * Varianz = -1 => Rückgabevariable
-		 * Varianz = 0 => unklar 
-		 * Varianz = 2 => Operatoren oderConstraints */
+		Set<Set<UnifyPair>> result = new HashSet<>();
+
 		ArrayList<UnifyPair> zeroNextElem = new ArrayList<>(nextSetasList.get(0)); 
 		UnifyPair fstBasePair = zeroNextElem.remove(0).getBasePair();
 		Boolean oderConstraint = false;
@@ -711,9 +706,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						.filter(d -> d.isPresent())
 						.map(e -> e.get())
 						.findAny();
-				if (xi.isPresent()) {
-					variance = xi.get();
-				}
 			}
 			else {
 				oderConstraint = true;
@@ -722,29 +714,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		else {
 			oderConstraint = true;
 		}
-		
-		//Varianz-Bestimmung Oder-Constraints 
-		if (oderConstraint) {
-			if (printtag) System.out.println("nextSetasList " + nextSetasList);
-			Optional<Integer> optVariance = 
-					nextSetasList.iterator()
-				 			  	 .next()
-				 			  	 .stream()
-				 			  	 .filter(x -> x.getGroundBasePair().getLhsType() instanceof PlaceholderType && 
-				 			  			! (x.getRhsType() instanceof PlaceholderType) &&
-				 			  			 x.getPairOp() == PairOperator.EQUALSDOT)
-				 			  	 .map(x -> 
-				 			  	 ((PlaceholderType)x.getGroundBasePair().getLhsType()).getVariance())
-				 			  	 .reduce((n,m) ->  { if ((n == 0) && (m==0)) return 0;
-				 			  	 					 else if (n !=0) return n;  //es muss mindestens eine Variance != 0 sein
-				 			  	 					      else return m;
-				 			  	                   });
-			//Fuer Operatorenaufrufe wird variance auf 2 gesetzt.
-			//da kein Receiver existiert also kein x.getGroundBasePair().getLhsType() instanceof PlaceholderType
-			//Bei Varianz = 2 werden alle Elemente des Kartesischen Produkts abgearbeitet
-			variance = optVariance.isPresent() ? optVariance.get() : 2;
-		}
-		/* Varianzbestimmung Ende */

 		//writeLog("nextSetasList: " + nextSetasList.toString());
 		Set<UnifyPair> nextSetElem =  nextSetasList.get(0);
@@ -811,80 +780,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			
 			writeLog("nextSet: " + nextSet.toString());
 			writeLog("nextSetasList: " + nextSetasList.toString());
-			
-			/* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
-			if (variance == 1) {
-				a = oup.max(nextSetasList.iterator());
-				nextSetasList.remove(a);
-				if (oderConstraint) {
-					nextSetasListOderConstraints.add(((Constraint<UnifyPair>)a).getExtendConstraint());
-				}	
-				writeLog("nextSetasListOderConstraints 1: " + nextSetasListOderConstraints);
-				nextSetasListRest = new ArrayList<>(nextSetasList);
-				Iterator<Set<UnifyPair>> nextSetasListItRest = new ArrayList<Set<UnifyPair>>(nextSetasListRest).iterator();
-				while (nextSetasListItRest.hasNext()) {
-					Set<UnifyPair> a_next = nextSetasListItRest.next();
-					if (//a.equals(a_next) || 
-							(oup.compare(a, a_next) == 1)) {
-						nextSetasListRest.remove(a_next);
-					}
-				}
-				
-				//Alle maximale Elemente in  nextSetasListRest bestimmen
-				//nur für diese wird parallele Berechnung angestossen.
-				nextSetasListRest = oup.maxElements(nextSetasListRest);
-			}
-			else if (variance == -1) {
-				a = oup.min(nextSetasList.iterator());
-				writeLog("Min: a in " + variance + " "+ a);
-				if (oderConstraint) {
-					nextSetasListOderConstraints.add(((Constraint<UnifyPair>)a).getExtendConstraint());
-				}	
-				writeLog("nextSetasListOderConstraints -1: " + nextSetasListOderConstraints);
-				nextSetasList.remove(a);
-				nextSetasListRest = new ArrayList<>(nextSetasList);
-				Iterator<Set<UnifyPair>> nextSetasListItRest = new ArrayList<Set<UnifyPair>>(nextSetasListRest).iterator();
-				while (nextSetasListItRest.hasNext()) {
-					Set<UnifyPair> a_next = nextSetasListItRest.next();
-					if (//a.equals(a_next) || 
-							(oup.compare(a, a_next) == -1)) {
-						nextSetasListRest.remove(a_next);
-					}
-				}
-				//Alle minimalen Elemente in  nextSetasListRest bestimmen
-				//nur für diese wird parallele Berechnung angestossen.
-				nextSetasListRest = oup.minElements(nextSetasListRest);
-			}
-			else if (variance == 2) {
-				a = nextSetasList.remove(0);
-				
-				//Fuer alle Elemente wird parallele Berechnung angestossen.
-				nextSetasListRest = new ArrayList<>(nextSetasList);
-			} 
-			else if (variance == 0) {
-				//wenn a <. theta dann ist ein maximales Element sehr wahrscheinlich
-				//wenn theta <. a dann ist ein minimales Element sehr wahrscheinlich
-				if (!oderConstraint && optOrigPair != null && optOrigPair.isPresent()) {
-					if (optOrigPair.get().getBasePair().getLhsType() instanceof PlaceholderType) {
-						a = oup.max(nextSetasList.iterator());
-					}
-					else {
-						a = oup.min(nextSetasList.iterator());
-					}
-					nextSetasList.remove(a);
-				}
-				else {
-					if (oderConstraint) {
-						a = oup.max(nextSetasList.iterator());
-						nextSetasList.remove(a);
-						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)a).getExtendConstraint());
-					}
-					else {
-						a = nextSetasList.remove(0);
-					}
-				}
-			}
-			Nextvar an Hand Varianzbestimmung auskommentieren Ende */
+
 			a = nextSetasList.remove(0); //statisticsList
 			
 			//writeStatistics(a.toString());
@@ -895,7 +791,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {

 			i++;
 			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(oneElems);
-			writeLog("a1: " + rekTiefe + "  "+ "variance:  "+ variance + " " + a.toString()+ "\n");
 			
 			//Ergebnisvariable für den aktuelle Thread
 			Set<Set<UnifyPair>> res = new HashSet<>();
@@ -920,286 +815,49 @@ 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){
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
 				List<Set<Constraint<UnifyPair>>> newOderConstraintsOrig = new ArrayList<>(oderConstraints);
 				newElemsOrig.add(a);
-				
-				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
-				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
-				/* FORK ENDE */
-				
-				synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint, constraintSetRepository);
+				forkOrig.fork();
+
 				while (!nextSetasList.isEmpty()) {
-					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
-						writeLog("1 RM" + nSaL.toString());
-					}
-					
-					if (!oderConstraint) {
-						
-						/* statistics sameEq wird nicht betrachtet ANGFANG
-						//ueberpruefung ob zu a =. ty \in nSaL in sameEqSet ein Widerspruch besteht
-						if (!sameEqSet.isEmpty() && !checkNoContradiction(nSaL, sameEqSet, result)) {
-							nSaL = null;
-							noShortendElements++;
-							continue;
-						}
-						statistics sameEq wird nicht betrachtet ENDE */
-					}
-					else {
-						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
+					Set<UnifyPair> nSaL = nextSetasList.removeFirst();
+
+					if (oderConstraint) {
+						nextSetasListOderConstraints.add(((Constraint<UnifyPair>) nSaL).getExtendConstraint());
 					}
+
 					Set<UnifyPair> newEq = new HashSet<>(eq);
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint), constraintSetRepository);
 					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-					}
+					fork.fork();
 				}
-				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
-				
-				/* FORK ANFANG */
-				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
-					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
-					//noOfThread++;
-					forkOrig.writeLog("final Orig 1");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res);
-				};
-				/* FORK ENDE */
-				
+
+				res = forkOrig.join();
+
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
-				for(TypeUnify2Task fork : forks) {
-					synchronized (this) {
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben
-						writeLog("fork_res: " + fork_res.toString());
-						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
-						add_res.add(fork_res);
-						if (!isUndefinedPairSetSet(fork_res)) {
-							aParDef.add(fork.getNextSetElement());
-						}
-						fork.writeLog("final 1");
-						fork.closeLogFile();
-					};
-				}
-				//noOfThread++;
-			} else {
-			if(parallel && (variance == -1)) {
-				Set<TypeUnify2Task> forks = new HashSet<>();
-				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
-				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
-				List<Set<Constraint<UnifyPair>>> newOderConstraintsOrig = new ArrayList<>(oderConstraints);
-				newElemsOrig.add(a);
-				
-				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
-				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
-				/* FORK ENDE */
-				
-				synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
-				while (!nextSetasList.isEmpty()) {
-					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
-						writeLog("-1 RM" + nSaL.toString());
-					}
-					
-					if (!oderConstraint) {
-						/* statistics sameEq wird nicht betrachtet ANGFANG
-						//ueberpruefung ob zu a =. ty \in nSaL in sameEqSet ein Widerspruch besteht
-						if (!sameEqSet.isEmpty() && !checkNoContradiction(nSaL, sameEqSet, result)) {
-							nSaL = null;
-							noShortendElements++;
-							continue;
-						}
-						statistics sameEq wird nicht betrachtet ENDE */
-					}
-					else {
-						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
-					}
-					Set<UnifyPair> newEq = new HashSet<>(eq);
-					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
-					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
-					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
-					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
+				for (TypeUnify2Task fork : forks) {
+					Set<Set<UnifyPair>> fork_res = new HashSet<>();
+					fork_res = fork.join();
+					add_res.add(fork_res);
+					if (!isUndefinedPairSetSet(fork_res)) {
+						aParDef.add(fork.getNextSetElement());
 					}
 				}
-				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
-				
-				/* FORK ANFANG */
-				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
-					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
-					//noOfThread++;
-					forkOrig.writeLog("final Orig -1");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res);
-				};
-				/* FORK ENDE */
-				
-				forks.forEach(x -> writeLog("wait: " + x.thNo));
-				for(TypeUnify2Task fork : forks) {
-					synchronized (this) {
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben 
-						writeLog("fork_res: " + fork_res.toString());
-						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
-						add_res.add(fork_res);
-						if (!isUndefinedPairSetSet(fork_res)) {
-							aParDef.add(fork.getNextSetElement());
-						}
-						fork.writeLog("final -1");
-						fork.closeLogFile();
-					};
+			}else{
+				elems.add(a);
+				//Überprüfen ob das Set bereits berechnet wurde
+				if(!constraintSetRepository.containsSet(elems)){
+					res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe, new HashSet<>(methodSignatureConstraint));
 				}
-				//noOfThread++;
-		    } else {
-		    if(parallel && (variance == 2)) {
-		    	writeLog("var2einstieg");
-		    	Set<TypeUnify2Task> forks = new HashSet<>();
-		    	Set<UnifyPair> newEqOrig = new HashSet<>(eq);
-		    	Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
-		    	List<Set<Constraint<UnifyPair>>> newOderConstraintsOrig = new ArrayList<>(oderConstraints);
-		    	newElemsOrig.add(a);
-				
-				/* FORK ANFANG */
-		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
-		    	//forks.add(forkOrig);
-		    	synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-		    	}
-		    	/* FORK ENDE */
-		    	
-		    	synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
-		    	while (!nextSetasList.isEmpty()) {
-		    		Set<UnifyPair> nSaL = nextSetasList.remove(0);
-		    		//nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
-		    		Set<UnifyPair> newEq = new HashSet<>(eq);
-		    		Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
-		    		List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
-		    		newElems.add(nSaL);
-		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
-		    		forks.add(fork);
-		    		synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-		    		}
-		    	}
-		    	//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
-		    	
-		    	/* FORK ANFANG */
-		    	synchronized (this) {
-		    		writeLog("wait "+ forkOrig.thNo);
-					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
-					//noOfThread++;
-					forkOrig.writeLog("final Orig 2");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res); //vermutlich falsch
-				};
-				/* FORK ENDE */
-		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
-		    	for(TypeUnify2Task fork : forks) {
-		    		synchronized (this) {
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben 
-						add_res.add(fork_res);
-						fork.writeLog("final 2");
-						fork.closeLogFile();
-					};
-				} 
-		    	//noOfThread++;	
-		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, sequentiell weiterarbeiten
-				elems.add(a); //PL 2019-01-16 muss das wirklich hin steht schon in Zeile 859 ja braucht man siehe Zeile 859
-				res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe, new HashSet<>(methodSignatureConstraint));
-		    }}}
+			}
 			
 			//Ab hier alle parallele Berechnungen wieder zusammengeführt.
 			//if (hilf == 1)
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
@@ -1,13 +1,10 @@
 package de.dhbwstuttgart.typeinference.unify.model;

-import java.io.File;
-import java.io.FileWriter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;

 import de.dhbwstuttgart.typeinference.unify.distributeVariance;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
@@ -23,7 +20,7 @@ public final class PlaceholderType extends UnifyType{
 	 * Static list containing the names of all existing placeholders.
 	 * Used for generating fresh placeholders.
 	 */
-	public static final ArrayList<String> EXISTING_PLACEHOLDERS = new ArrayList<String>();
+	public static final Set<String> EXISTING_PLACEHOLDERS = ConcurrentHashMap.newKeySet();
 	
 	/**
 	 * Prefix of auto-generated placeholder names.
@@ -96,7 +93,7 @@ public final class PlaceholderType extends UnifyType{
 	 * A user could later instantiate a type using the same name that is equivalent to this type.
 	 * @return A fresh placeholder type.
 	 */
-	public synchronized static PlaceholderType freshPlaceholder() {
+	public static PlaceholderType freshPlaceholder() {
 		String name = nextName + (char) (rnd.nextInt(22) + 97); // Returns random char between 'a' and 'z'
 		// Add random chars while the name is in use.
 		while(EXISTING_PLACEHOLDERS.contains(name)) {
--- a/src/test/java/UnifyTest.java
+++ b/src/test/java/UnifyTest.java
@@ -9,6 +9,9 @@ import de.dhbwstuttgart.typeinference.unify.model.*;
 import org.apache.commons.io.output.NullWriter;
 import org.junit.Test;

+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;

@@ -80,6 +83,16 @@ 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());
+        if(false){
+            try {
+                FileWriter fw = new FileWriter(new File("C:\\Users\\ykont\\Downloads"));
+                fw.write(solution.toString());
+                fw.flush();
+                fw.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
        //System.out.println(solution);
    }}
Author	SHA1	Message	Date
NoName11234	dc72ae80fc	Merge branch 'performanceTestBase' into performanceTestRecursionOptimization	2024-05-02 15:56:46 +02:00
NoName11234	7e84aa0a2b	added option for printing out calculated solution in file	2024-05-02 15:56:03 +02:00
NoName11234	3bb7f38805	implemented ConstraintSetRepository	2024-05-01 20:05:28 +02:00
NoName11234	6a92b0f194	added class ConstraintSetRepository	2024-05-01 19:42:24 +02:00
NoName11234	996ef1a735	Merge branch 'performanceTestPlaceholderGenerator' into performanceTestBase	2024-04-26 12:51:00 +02:00
NoName11234	2bb2f1a898	Merge branch 'performanceTestThreadCounter' into performanceTestBase	2024-04-26 12:50:44 +02:00
NoName11234	cf8653567c	changed arraylist to concurrent set and removed snychronized	2024-04-25 19:17:12 +02:00
NoName11234	72908f6fb4	removed variance from typeunifytask	2024-04-25 19:08:26 +02:00