Index: /branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java (revision 1656) +++ /branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java (revision 1657) @@ -13,4 +13,9 @@ seq[i] = i; } + + int[] seq2 = new int[]{1,5,2,6,5,6,4,5,2,6}; + + int[] seq3 = new int[]{0,0,5,6,0,6,9,10,0,12,13,0,15,16,0,13,0,15,21,13,0,15,21,0,0,0,6,0,9,32,0,5,10,0,6,0,9,32,0,5,43,0,6,0,9,5,6,0,9,43,0,6,0,9,32,0,5,6,6,9,43,0,0,0,0}; + int[] pat1 = new int[]{2,3,4}; @@ -32,17 +37,49 @@ int[] pat11 = new int[]{5,-1,-1,6}; int[] pat12 = new int[]{10,12,12,12}; + + //int[] pat13 = new int[]{6, 0, 6, 9,-1,-1,10,0}; + //int[] pat14 = new int[]{6,-1, 9,71,32, 5,10,0}; + int[] pat13 = new int[]{6, 0, 9, 32,0,5,10,0}; + int[] pat14 = new int[]{6,-1, 71,32,-1,5,10,0}; NumberSequence ns = new NumberSequence(10); ns.setSequence(seq); + NumberSequence ns2 = new NumberSequence(seq3.length); + ns2.setSequence(seq3); + NumberSequence firstpattern = new NumberSequence(3); NumberSequence secondpattern = new NumberSequence(3); + + NumberSequence thirdpattern = new NumberSequence(4); + NumberSequence forthpattern= new NumberSequence(4); + + NumberSequence fifthpattern = new NumberSequence(pat13.length); + NumberSequence sixthpattern = new NumberSequence(pat14.length); + firstpattern.setSequence(pat1); secondpattern.setSequence(pat2); + thirdpattern.setSequence(pat11); + forthpattern.setSequence(pat12); + + fifthpattern.setSequence(pat13); + sixthpattern.setSequence(pat14); + + Match pattern = new Match(); pattern.setFirstSequence(firstpattern); - pattern.setSecondSequence(secondpattern); + pattern.setSecondSequence(secondpattern); + + Match pattern2 = new Match(); + pattern2.setFirstSequence(thirdpattern); + pattern2.setSecondSequence(forthpattern); + + Match pattern3 = new Match(); + pattern3.setFirstSequence(fifthpattern); + pattern3.setSecondSequence(sixthpattern); + + /* assertEquals(Integer.valueOf(2),ns.containsPattern(pattern).get(0)); assertEquals(1,ns.containsPattern(pattern).size()); @@ -79,5 +116,20 @@ assertEquals(Integer.valueOf(5),ns.containsPattern(pattern).get(0)); - + ns.setSequence(seq2); + firstpattern.setSequence(pat3); + secondpattern.setSequence(pat4); + assertEquals(3,ns.containsPattern(pattern).size()); + assertEquals(Integer.valueOf(1),ns.containsPattern(pattern).get(0)); + assertEquals(Integer.valueOf(4),ns.containsPattern(pattern).get(1)); + assertEquals(Integer.valueOf(7),ns.containsPattern(pattern).get(2)); + */ + + assertEquals(2,ns2.containsPattern(pattern3)); + assertEquals(2,ns2.containsPattern(pattern3).size()); + assertEquals(Integer.valueOf(3),ns.containsPattern(pattern3).get(0)); + assertEquals(Integer.valueOf(26),ns.containsPattern(pattern3).get(1)); + + + } Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/Match.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/Match.java (revision 1656) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/Match.java (revision 1657) @@ -41,4 +41,9 @@ return occurences.size(); } + + public int size() { + //Both sequences should be equally long + return matchseqs.get(0).size(); + } public boolean equals(Match m) { Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/MatchOccurence.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/MatchOccurence.java (revision 1656) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/MatchOccurence.java (revision 1657) @@ -3,9 +3,22 @@ public class MatchOccurence { private int startindex; + private int endindex; private int sequenceId; - public MatchOccurence(int startindex, int sequenceId) { + + public MatchOccurence(int startindex, int endindex, int sequenceId) { this.startindex = startindex; + this.endindex = endindex; this.sequenceId = sequenceId; } + + public int getEndindex() { + return endindex; + } + + public void setEndindex(int endindex) { + this.endindex = endindex; + } + + public int getStartindex() { return startindex; @@ -17,3 +30,7 @@ return sequenceId; } + + public void setSequenceId(int sequenceId) { + this.sequenceId = sequenceId; + } } Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java (revision 1656) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java (revision 1657) @@ -8,10 +8,9 @@ private int id; - public NumberSequence(int size) { sequence = new int[size]; } - + public int[] getSequence() { return sequence; @@ -45,5 +44,5 @@ } - //Searching occurrences of + // Searching occurrences of public LinkedList containsPattern(Match pattern) { LinkedList result = new LinkedList(); @@ -51,31 +50,43 @@ int[] pat1 = pattern.getFirstSequence().getSequence(); int[] pat2 = pattern.getSecondSequence().getSequence(); - notmatched: while (i < sequence.length - pat1.length) { + notmatched: while (i <= sequence.length - pat1.length) { if (sequence[i] == pat1[0] || sequence[i] == pat2[0]) { - int ipat1 =0; - int ipat2 =0; + int ipat1 = 0; + int ipat2 = 0; int optcount1 = 0; int optcount2 = 0; - while(ipat1 < pat1.length && ipat2 @@ -107,12 +111,16 @@ .createNewTaskInstance(model); - for (int i=0; i it = subsequence.iterator();it.hasNext();) { System.out.println(it.next()); - } + }*/ + System.out.println(); + System.out.println(); taskBuilder.addTaskInstance(parent, startIndex, subsequence); Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java =================================================================== --- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java (revision 1656) +++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java (revision 1657) @@ -95,11 +95,8 @@ *

* the task handling strategy to be used for comparing tasks during - * iteration detection i.e., after the tasks are - * harmonized + * iteration detection i.e., after the tasks are harmonized *

*/ private TaskHandlingStrategy identityTaskHandlingStrategy; - - /** @@ -166,6 +163,4 @@ .generate(appData.getNumberSequences(), submat, 9); - - // Retrieve all matches reached a specific threshold Console.traceln(Level.INFO, "retrieving significant sequence pieces"); @@ -174,6 +169,7 @@ Level.FINEST, "retrieving significant sequence pieces: " - + Math.round((float) i / (float) appData.getNumberSequences().size() - * 100) + "%"); + + Math.round((float) i + / (float) appData.getNumberSequences() + .size() * 100) + "%"); for (int j = 0; j < appData.getNumberSequences().size(); j++) { if (i != j) { @@ -197,27 +193,29 @@ .getFirstSequence().size()) continue; - + for (int j = 0; j < appData.getNumberSequences().size(); j++) { - LinkedList startpositions = appData.getNumberSequences().get(j) - .containsPattern(pattern); + LinkedList startpositions = appData + .getNumberSequences().get(j).containsPattern(pattern); if (startpositions.size() > 0) { NumberSequence tempns = appData.getNumberSequences().get(j); - + for (Iterator jt = startpositions.iterator(); jt .hasNext();) { int start = jt.next(); - //TODO: Debug Output + // TODO: Debug Output /* - System.out.println("Found match "); - pattern.getFirstSequence().printSequence(); - pattern.getSecondSequence().printSequence(); - System.out.println("in sequence " + (j+1) + " at position " + start); - for(int k=0;k comparator = new Comparator() { public int compare(Match m1, Match m2) { - return m2.occurenceCount() - m1.occurenceCount(); - + return m2.occurenceCount() - m1.occurenceCount(); + } }; - //Collections.sort(matchseqs, comparator); - + // Collections.sort(matchseqs, comparator); // TODO: Harmonize matches: finding double matches and merge them /* - Console.traceln(Level.INFO, "harmonizing matches"); - int i=0; - - while(i> replacedOccurences = new HashMap>(); + // Replace matches in the sessions for (int i = 0; i < matchseqs.size(); i++) { // Every pattern consists of 2 sequences, therefore the minimum @@ -274,48 +260,103 @@ // well if (matchseqs.get(i).occurenceCount() > 2) { - - ISequence task = matchAsSequence(appData,matchseqs.get(i)); - for(Iterator it = matchseqs.get(i).getOccurences().iterator();it.hasNext();) { + + ISequence task = matchAsSequence(appData, matchseqs.get(i)); + invalidOccurence: for (Iterator it = matchseqs + .get(i).getOccurences().iterator(); it.hasNext();) { MatchOccurence oc = it.next(); System.out.println("Trying to replace sequence: "); matchseqs.get(i).getFirstSequence().printSequence(); matchseqs.get(i).getSecondSequence().printSequence(); - System.out.println(" in session number: " + (oc.getSequenceId()+1) + " at position " + (oc.getStartindex()) + "-" + (oc.getStartindex()+matchseqs.get(i).getFirstSequence().size())); + System.out.println(" in session number: " + + (oc.getSequenceId() + 1) + + " at position " + + (oc.getStartindex()) + + "-" + + (oc.getStartindex() + matchseqs.get(i) + .getFirstSequence().size())); System.out.println(); - /* - System.out.println("Printing session: "); - for(int j=0;j sequenceInstances = new LinkedList(); - RuleUtils.createNewSubSequenceInRange(sessions.get(oc.getSequenceId()), oc.getStartindex(), oc.getStartindex()+matchseqs.get(i).getFirstSequence().size(), task, taskFactory, taskBuilder); - } - //System.out.println(task); - //matchseqs.get(i).getFirstSequence().printSequence(); - //matchseqs.get(i).getSecondSequence().printSequence(); - //System.out.println("Found pattern " - // + matchseqs.get(i).occurenceCount() + " times"); + + //System.out.println("Printing session: "); + for (int j = 0; j < sessions.get(oc.getSequenceId()).size(); j++) { + System.out.println(j + ": "+ sessions.get(oc.getSequenceId()).get(j)); + } + + // Check if nothing has been replaced in the sequence we + // want to replace + if (replacedOccurences.get(oc.getSequenceId()) == null) { + replacedOccurences.put(oc.getSequenceId(), + new LinkedList()); + } else { + // check if we have any replaced occurence with indexes + // smaller than ours. If so, we need to adjust our start + // and endpoints + // of the replacement. + // Also do a check if we have replaced this specific + // MatchOccurence in this sequence already. Jump to the + // next occurence if this is the case. + // This is no more neccessary once the matches are + // harmonized. + for (Iterator jt = replacedOccurences + .get(oc.getSequenceId()).iterator(); jt + .hasNext();) { + MatchOccurence tmpOC = jt.next(); + if (tmpOC.getStartindex() == oc.getStartindex()) { + System.out.println("This position has already been replaced in this iteration"); + continue invalidOccurence; + + } + if (tmpOC.getStartindex() < oc + .getStartindex()) { + int diff = tmpOC.getEndindex() + - tmpOC.getStartindex(); + // Just to be sure. + if (diff > 0) { + System.out.println("Old index: Start: " + + oc.getStartindex() + " End " + + oc.getEndindex()); + oc.setStartindex(oc.getStartindex() - diff+1); + oc.setEndindex(oc.getEndindex() - diff+1); + System.out.println("Updated index: Start: " + + oc.getStartindex() + " End " + + oc.getEndindex()); + } else { + Console.traceln(Level.WARNING, + "End index of a Match before start. This should never happen"); + } + } + } + } + + + ISequenceInstance sequenceInstances = RuleUtils.createNewSubSequenceInRange( + sessions.get(oc.getSequenceId()), + oc.getStartindex(), oc.getEndindex(), task, + taskFactory, taskBuilder); + + //Adjust the length of the match regarding to the length of instance. (OptionalInstances may be shorter) + oc.setEndindex(oc.getStartindex()+sequenceInstances.size()-RuleUtils.missedOptionals); + replacedOccurences.get(oc.getSequenceId()).add(oc); + } + System.out.println(); } } - alignments = null; do { - - appData.getStopWatch().start("whole loop"); // - detectAndReplaceIterations(appData); - - appData.getStopWatch().start("task replacement"); // - //detectAndReplaceTasks(appData); // - appData.getStopWatch().stop("task replacement"); // - appData.getStopWatch().stop("whole loop"); - - appData.getStopWatch().dumpStatistics(System.out); // - appData.getStopWatch().reset(); - - } while (appData.detectedAndReplacedTasks()); - + + appData.getStopWatch().start("whole loop"); // + detectAndReplaceIterations(appData); + + appData.getStopWatch().start("task replacement"); // + // detectAndReplaceTasks(appData); // + appData.getStopWatch().stop("task replacement"); // + appData.getStopWatch().stop("whole loop"); + + appData.getStopWatch().dumpStatistics(System.out); // + appData.getStopWatch().reset(); + + } while (appData.detectedAndReplacedTasks()); Console.println("created " @@ -334,6 +375,4 @@ } - - /** *

@@ -363,7 +402,7 @@ ITask task; List sessions = appData.getSessions(); - for (int j = 0; j< sessions.size();j++) { + for (int j = 0; j < sessions.size(); j++) { IUserSession session = sessions.get(j); - + NumberSequence templist = new NumberSequence(session.size()); @@ -375,5 +414,5 @@ uniqueTasks.addSymbol(taskInstance, taskInstance.getTask()); templist.getSequence()[i] = taskInstance.getTask().getId(); - + } else { taskBuilder.setTask(taskInstance, task); @@ -381,9 +420,16 @@ unifiedTasks++; } - appData.getNumber2Task().put(templist.getSequence()[i], taskInstance.getTask()); + appData.getNumber2Task().put(templist.getSequence()[i], + taskInstance.getTask()); - //System.out.println("TaskID: " + taskInstance.getTask().getId()+ " Numbersequence: " + templist.getSequence()[i]); - } - //Each NumberSequence is identified by its id, beginning to count at zero + //if(j==1) { + // System.out.println(i + ": TaskID: " + + // taskInstance.getTask().getId()+ " Numbersequence: " + + // templist.getSequence()[i]); + //} + + } + // Each NumberSequence is identified by its id, beginning to count + // at zero templist.setId(j); appData.getNumberSequences().add(templist); @@ -528,61 +574,66 @@ } - - ISequence matchAsSequence(RuleApplicationData appData,Match m) { - - ISequence sequence = taskFactory.createNewSequence(); - - int[] first = m.getFirstSequence().getSequence(); - int[] second = m.getSecondSequence().getSequence(); - - - //Both sequences of a match are equally long - for(int i=0;i @@ -659,5 +710,5 @@ appData.getStopWatch().start("detecting tasks"); - //getSequencesOccuringMostOften(appData); + // getSequencesOccuringMostOften(appData); appData.getStopWatch().stop("detecting tasks"); @@ -667,12 +718,9 @@ appData.getStopWatch().stop("replacing tasks"); - - //Console.traceln(Level.INFO, "detected and replaced " - // + appData.getLastFoundTasks().size() + " tasks occuring " - // + appData.getLastFoundTasks().getOccurrenceCount() + " times"); - } - - - + + // Console.traceln(Level.INFO, "detected and replaced " + // + appData.getLastFoundTasks().size() + " tasks occuring " + // + appData.getLastFoundTasks().getOccurrenceCount() + " times"); + } /** @@ -684,36 +732,27 @@ appData.detectedAndReplacedTasks(false); - /* - Console.traceln(Level.FINER, "replacing tasks occurrences"); - - for (List task : appData.getLastFoundTasks()) { - ISequence sequence = taskFactory.createNewSequence(); - - Console.traceln(Level.FINEST, "replacing " + sequence.getId() - + ": " + task); - - List sequenceInstances = replaceTaskOccurrences( - task, appData.getSessions(), sequence); - - harmonizeSequenceInstancesModel(sequence, sequenceInstances, - task.size()); - appData.detectedAndReplacedTasks(appData - .detectedAndReplacedTasks() - || (sequenceInstances.size() > 0)); - - if (sequenceInstances.size() < appData.getLastFoundTasks() - .getOccurrenceCount()) { - Console.traceln(Level.FINE, - sequence.getId() - + ": replaced task only " - + sequenceInstances.size() - + " times instead of expected " - + appData.getLastFoundTasks() - .getOccurrenceCount()); - } - } - */ - } - + /* + * Console.traceln(Level.FINER, "replacing tasks occurrences"); + * + * for (List task : appData.getLastFoundTasks()) { + * ISequence sequence = taskFactory.createNewSequence(); + * + * Console.traceln(Level.FINEST, "replacing " + sequence.getId() + ": " + * + task); + * + * List sequenceInstances = replaceTaskOccurrences( + * task, appData.getSessions(), sequence); + * + * harmonizeSequenceInstancesModel(sequence, sequenceInstances, + * task.size()); appData.detectedAndReplacedTasks(appData + * .detectedAndReplacedTasks() || (sequenceInstances.size() > 0)); + * + * if (sequenceInstances.size() < appData.getLastFoundTasks() + * .getOccurrenceCount()) { Console.traceln(Level.FINE, sequence.getId() + * + ": replaced task only " + sequenceInstances.size() + + * " times instead of expected " + appData.getLastFoundTasks() + * .getOccurrenceCount()); } } + */ + } /** @@ -847,5 +886,4 @@ } - /** * @@ -853,16 +891,12 @@ private static class RuleApplicationData { - - private HashMap number2task; - - + private HashMap number2task; + private ArrayList numberseqs; - + /** * */ private List sessions; - - /** @@ -887,7 +921,7 @@ this.sessions = sessions; numberseqs = new ArrayList(); - number2task = new HashMap(); - stopWatch= new StopWatch(); - result = new RuleApplicationResult(); + number2task = new HashMap(); + stopWatch = new StopWatch(); + result = new RuleApplicationResult(); } @@ -899,10 +933,7 @@ } - private ArrayList getNumberSequences() { return numberseqs; } - - /** @@ -934,5 +965,5 @@ } - private HashMap getNumber2Task() { + private HashMap getNumber2Task() { return number2task; } @@ -940,6 +971,3 @@ } - - - }