Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/EventTaskInstancesListGenerator.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/EventTaskInstancesListGenerator.java (revision 1695) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/EventTaskInstancesListGenerator.java (revision 1695) @@ -0,0 +1,34 @@ +package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; + +import java.util.LinkedList; + +import de.ugoe.cs.autoquest.tasktrees.treeifc.DefaultTaskTraversingVisitor; +import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; +import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; + +public class EventTaskInstancesListGenerator extends DefaultTaskTraversingVisitor { + + private LinkedList eventlist; + + public LinkedList getEventlist() { + return eventlist; + } + + public void setEventlist(LinkedList eventlist) { + this.eventlist = eventlist; + } + + @Override + public void visit(IEventTask eventTask) { + if(eventTask.getInstances().size() > 0) { + IEventTaskInstance eti = (IEventTaskInstance) eventTask.getInstances().iterator().next(); + //System.out.println("Adding eventtaskinstance to list: " + eti); + eventlist.add(eti); + } + } + + public EventTaskInstancesListGenerator() { + eventlist = new LinkedList(); + } + +} Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java (revision 1694) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java (revision 1695) @@ -1,52 +1,82 @@ package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; - import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; +import java.util.logging.Level; import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.AlignmentHelpers; import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.Constants; +import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance; - +import de.ugoe.cs.util.console.Console; public class ObjectDistanceSubstitionMatrix implements SubstitutionMatrix { - HashMap idmapping; + private HashMap idmapping; private TriangleMatrix matrix; private HashSet uniqueTasks; - private double gapPenalty; + private double gapPenalty; private int index = 0; - + private HashMap> etisOfTasks; + private boolean calculateNonTaskInstances = true; + private double positiveThreshold; - - public ObjectDistanceSubstitionMatrix( - HashSet uniqueTasks,float positiveThreshold, int gapPenalty) { + + public ObjectDistanceSubstitionMatrix(HashSet uniqueTasks, + float positiveThreshold, int gapPenalty, + boolean calculateNonTaskInstances) { this.uniqueTasks = uniqueTasks; this.positiveThreshold = positiveThreshold; idmapping = new HashMap(); - matrix = new TriangleMatrix(uniqueTasks.size()+1); + etisOfTasks = new HashMap>(); + matrix = new TriangleMatrix(uniqueTasks.size() + 1); this.gapPenalty = gapPenalty; - - } - + this.calculateNonTaskInstances = calculateNonTaskInstances; + + } public double getGapPenalty() { return gapPenalty; } - + public void setGapPenalty(double gapPenalty) { this.gapPenalty = gapPenalty; } + private void searchEventTaskInstances() { + int count = 0; + for (Iterator it = uniqueTasks.iterator(); it.hasNext();) { + count++; + + ITask task = it.next(); + if (!(task instanceof IEventTask)) { + EventTaskInstancesListGenerator etlg = new EventTaskInstancesListGenerator(); + task.accept(etlg); + LinkedList eventTaskInstances = etlg + .getEventlist(); + etisOfTasks.put(task.getId(), eventTaskInstances); + } + } + + } + public void generate() { - - int index1=-1; - int index2=-1; - float distance=0; + if (this.calculateNonTaskInstances) { + Console.traceln(Level.INFO, " searching EventTasks in Tasks"); + searchEventTaskInstances(); + } + Console.traceln(Level.INFO, " calculating distances"); + int index1 = -1; + int index2 = -1; + double distance = 0; + int count = 0; for (Iterator it = uniqueTasks.iterator(); it.hasNext();) { + count++; + ITask task1 = it.next(); for (Iterator jt = uniqueTasks.iterator(); jt.hasNext();) { @@ -54,113 +84,149 @@ ITaskInstance ti1 = null; ITaskInstance ti2 = null; - //TODO This seems ugly - if(task1.getInstances().size() > 0) { - ti1 = (ITaskInstance) task1.getInstances().iterator().next(); - } - if(task2.getInstances().size() > 0) { - ti2 = (ITaskInstance) task2.getInstances().iterator().next(); + // We just need to the first instance here + if (task1.getInstances().size() > 0) { + ti1 = (ITaskInstance) task1.getInstances().iterator() + .next(); + } + if (task2.getInstances().size() > 0) { + ti2 = (ITaskInstance) task2.getInstances().iterator() + .next(); } IEventTaskInstance eti1 = null; IEventTaskInstance eti2 = null; - - - if (ti1 instanceof IEventTaskInstance && ti2 instanceof IEventTaskInstance) { + + if (ti1 instanceof IEventTaskInstance + && ti2 instanceof IEventTaskInstance) { eti1 = (IEventTaskInstance) ti1; index1 = getIndex(eti1); eti2 = (IEventTaskInstance) ti2; index2 = getIndex(eti2); - distance = distanceBetweenInstances(eti1,eti2); - } - else if(ti1 instanceof IEventTaskInstance && !(ti2 instanceof IEventTaskInstance)) { + distance = distanceBetweenInstances(eti1, eti2); + } else if (ti1 instanceof IEventTaskInstance + && !(ti2 instanceof IEventTaskInstance)) { task1 = ((ITaskInstance) ti1).getTask(); index2 = getIndex(task2); eti1 = (IEventTaskInstance) ti1; index1 = getIndex(eti1); - distance = distanceBetweenTaskAndInstance(task2,eti1); - } - else if(!(ti1 instanceof IEventTaskInstance) && ti2 instanceof IEventTaskInstance) { + distance = distanceBetweenTaskAndInstance(task2, eti1); + } else if (!(ti1 instanceof IEventTaskInstance) + && ti2 instanceof IEventTaskInstance) { index1 = getIndex(task1); eti2 = (IEventTaskInstance) ti2; index2 = getIndex(eti2); - distance = distanceBetweenTaskAndInstance(task1,eti2); - } - else if(!(ti1 instanceof IEventTaskInstance) && !(ti2 instanceof IEventTaskInstance)) { + distance = distanceBetweenTaskAndInstance(task1, eti2); + } else if (!(ti1 instanceof IEventTaskInstance) + && !(ti2 instanceof IEventTaskInstance)) { index1 = getIndex(task1); index2 = getIndex(task2); - distance = distanceBetweenTasks(task1,task2); - } - else { + distance = distanceBetweenTasks(task1, task2); + } else { System.out.println("Unknown error"); } - - matrix.set(index1, index2,distance); - - } - } - } - - //TODO: Calculate distance here - private float distanceBetweenTaskAndInstance(ITask task1, IEventTaskInstance eti) { - return 0; - } - - private float distanceBetweenTasks(ITask task1, ITask task2) { - return 0; - } - + + matrix.set(index1, index2, distance); + + } + } + } + + private double distanceBetweenTaskAndInstance(ITask task1, + IEventTaskInstance eti1) { + if (this.calculateNonTaskInstances) { + float tmpDistance = 0; + LinkedList eventTaskInstances = etisOfTasks + .get(task1.getId()); + for (Iterator it = eventTaskInstances + .iterator(); it.hasNext();) { + IEventTaskInstance eti2 = it.next(); + int taskId1 = eti1.getTask().getId(); + int taskId2 = eti2.getTask().getId(); + if (scoreExists(taskId1, taskId2)) { + tmpDistance += getScore(taskId1, taskId2); + } else { + double dist = distanceBetweenInstances(eti1, eti2); + matrix.set(getIndex(eti1), getIndex(eti2), dist); + tmpDistance += dist; + } + } + return tmpDistance / eventTaskInstances.size(); + } else { + return 0; + } + } + + public boolean scoreExists(int id, int id2) { + return idmapping.containsKey(id) && idmapping.containsKey(id2); + } + + private double distanceBetweenTasks(ITask task1, ITask task2) { + if (this.calculateNonTaskInstances) { + LinkedList eventTaskInstances = etisOfTasks + .get(task1.getId()); + float tmpDistance = 0; + for (Iterator it = eventTaskInstances + .iterator(); it.hasNext();) { + IEventTaskInstance eti1 = it.next(); + tmpDistance += distanceBetweenTaskAndInstance(task2, eti1); + } + + return tmpDistance / eventTaskInstances.size(); + } else { + return 0; + } + } private int getIndex(ITask task) { - int tempindex =-1; - - if(!idmapping.containsKey(task.getId())) { + int tempindex = -1; + + if (!idmapping.containsKey(task.getId())) { idmapping.put(task.getId(), index); tempindex = index; index++; - } - else { + } else { tempindex = idmapping.get(task.getId()); } - + return tempindex; } - + private int getIndex(IEventTaskInstance eti) { int tempindex = -1; - if(!idmapping.containsKey(eti.getTask().getId())) { + if (!idmapping.containsKey(eti.getTask().getId())) { idmapping.put(eti.getTask().getId(), index); tempindex = index; index++; - } - else { + } else { tempindex = idmapping.get(eti.getTask().getId()); } return tempindex; }; - - private float distanceBetweenInstances(IEventTaskInstance eti1, IEventTaskInstance eti2) { + + private double distanceBetweenInstances(IEventTaskInstance eti1, + IEventTaskInstance eti2) { IGUIElement first = (IGUIElement) eti1.getEvent().getTarget(); IGUIElement second = (IGUIElement) eti2.getEvent().getTarget(); - float distance = -1*AlignmentHelpers.distanceBetween(first, second); + float distance = -1 * AlignmentHelpers.distanceBetween(first, second); distance += positiveThreshold; return distance; } - - public String toString(){ + + public String toString() { return matrix.toString(); } public double getScore(int taskId1, int taskId2) { - if(taskId1 == Constants.GAP_SYMBOL || taskId1 == Constants.UNMATCHED_SYMBOL || taskId2 == Constants.GAP_SYMBOL || taskId2 == Constants.UNMATCHED_SYMBOL ) { - return 0.0; - } - else { - + if (taskId1 == Constants.GAP_SYMBOL + || taskId1 == Constants.UNMATCHED_SYMBOL + || taskId2 == Constants.GAP_SYMBOL + || taskId2 == Constants.UNMATCHED_SYMBOL) { + return 0.0; + } else { Integer first = idmapping.get(taskId1); Integer second = idmapping.get(taskId2); - return matrix.get(first,second); - } - + return matrix.get(first, second); + } + } } - Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/TriangleMatrix.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/TriangleMatrix.java (revision 1694) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/TriangleMatrix.java (revision 1695) @@ -32,4 +32,5 @@ } + public String toString() {