forked from JavaTX/JavaCompilerCore
Compare commits
6 Commits
performanc
...
c64071f235
Author | SHA1 | Date | |
---|---|---|---|
|
c64071f235 | ||
|
94dbf1f7ad | ||
|
890f64c813 | ||
|
5aadb7545e | ||
|
0c0ac61a02 | ||
|
46192e3fd3 |
@@ -56,7 +56,6 @@ import java.io.OutputStreamWriter;
|
|||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
|
|
||||||
import com.google.common.collect.Ordering;
|
import com.google.common.collect.Ordering;
|
||||||
import org.apache.commons.io.output.NullWriter;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -163,9 +162,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
|
|||||||
}
|
}
|
||||||
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) {
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
if(statistics==null){
|
|
||||||
statistics = new NullWriter();
|
|
||||||
}
|
|
||||||
this.eq = eq;
|
this.eq = eq;
|
||||||
//this.oderConstraints = oderConstraints.stream().map(x -> x.stream().map(y -> new HashSet<>(y)).collect(Collectors.toSet(HashSet::new))).collect(Collectors.toList(ArrayList::new));
|
//this.oderConstraints = oderConstraints.stream().map(x -> x.stream().map(y -> new HashSet<>(y)).collect(Collectors.toSet(HashSet::new))).collect(Collectors.toList(ArrayList::new));
|
||||||
this.oderConstraintsField = oderConstraints; /*.stream().map(x -> {
|
this.oderConstraintsField = oderConstraints; /*.stream().map(x -> {
|
||||||
|
@@ -7,16 +7,7 @@ import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
|
|||||||
import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
|
import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
|
||||||
import de.dhbwstuttgart.typedeployment.TypeInsert;
|
import de.dhbwstuttgart.typedeployment.TypeInsert;
|
||||||
import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
|
import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
|
||||||
import de.dhbwstuttgart.typeinference.constraints.Constraint;
|
|
||||||
import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
|
|
||||||
import de.dhbwstuttgart.typeinference.constraints.Pair;
|
|
||||||
import de.dhbwstuttgart.typeinference.result.ResultSet;
|
import de.dhbwstuttgart.typeinference.result.ResultSet;
|
||||||
import de.dhbwstuttgart.typeinference.unify.TypeUnify;
|
|
||||||
import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
|
|
||||||
import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
|
|
||||||
import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
|
|
||||||
import de.dhbwstuttgart.typeinference.unify.model.*;
|
|
||||||
import org.apache.commons.io.output.NullWriter;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -33,70 +24,6 @@ import java.util.Set;
|
|||||||
public class UnifyTest {
|
public class UnifyTest {
|
||||||
|
|
||||||
public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
|
public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
|
||||||
|
|
||||||
private UnifyPair genPairListOfInteger(String name){
|
|
||||||
|
|
||||||
UnifyType type1 = new PlaceholderType(name);
|
|
||||||
UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
|
|
||||||
UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
|
|
||||||
|
|
||||||
return pair1;
|
|
||||||
}
|
|
||||||
private UnifyPair genPairListOfString(String name){
|
|
||||||
|
|
||||||
PlaceholderType type1 = new PlaceholderType(name);
|
|
||||||
UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("String")));
|
|
||||||
UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
|
|
||||||
|
|
||||||
return pair1;
|
|
||||||
}
|
|
||||||
@Test
|
|
||||||
public void unifyTest(){
|
|
||||||
UnifyType type1;
|
|
||||||
UnifyType type2;
|
|
||||||
|
|
||||||
Set<UnifyPair> undConstraints = new HashSet<>();
|
|
||||||
undConstraints.add(genPairListOfInteger("a"));
|
|
||||||
undConstraints.add(genPairListOfString("a"));
|
|
||||||
|
|
||||||
undConstraints.add(genPairListOfInteger("b"));
|
|
||||||
undConstraints.add(genPairListOfString("b"));
|
|
||||||
undConstraints.add(genPairListOfInteger("c"));
|
|
||||||
undConstraints.add(genPairListOfString("c"));
|
|
||||||
undConstraints.add(genPairListOfInteger("d"));
|
|
||||||
undConstraints.add(genPairListOfString("d"));
|
|
||||||
undConstraints.add(genPairListOfInteger("e"));
|
|
||||||
undConstraints.add(genPairListOfString("e"));
|
|
||||||
undConstraints.add(genPairListOfInteger("e1"));
|
|
||||||
undConstraints.add(genPairListOfString("e1"));
|
|
||||||
undConstraints.add(genPairListOfInteger("e2"));
|
|
||||||
undConstraints.add(genPairListOfString("e2"));
|
|
||||||
undConstraints.add(genPairListOfInteger("e3"));
|
|
||||||
undConstraints.add(genPairListOfString("e3"));
|
|
||||||
|
|
||||||
List<Set<Constraint<UnifyPair>>> oderConstraints = new ArrayList<>();
|
|
||||||
|
|
||||||
Set<UnifyPair> constraints = new HashSet<>();
|
|
||||||
type1 = new ReferenceType("Object");
|
|
||||||
type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("X")));
|
|
||||||
constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
|
|
||||||
type1 = new ReferenceType("Object");
|
|
||||||
type2 = new ReferenceType("Integer");
|
|
||||||
constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
|
|
||||||
type1 = new ReferenceType("Object");
|
|
||||||
type2 = new ReferenceType("String");
|
|
||||||
constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
|
|
||||||
|
|
||||||
IFiniteClosure finiteClosure = new FiniteClosure(constraints, new NullWriter());
|
|
||||||
|
|
||||||
TypeUnify unifyAlgo = new TypeUnify();
|
|
||||||
ConstraintSet<Pair> cons = new ConstraintSet<>();
|
|
||||||
UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
@Test
|
@Test
|
||||||
public void finiteClosure() throws IOException, ClassNotFoundException {
|
public void finiteClosure() throws IOException, ClassNotFoundException {
|
||||||
|
Reference in New Issue
Block a user