Changeset 1735 for branches/autoquest-core-tasktrees-alignment/src/main

Timestamp:

09/05/14 20:50:52 (10 years ago)

Author:

rkrimmel

Message:

Code cleanup

File:

• branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (9 diffs)

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java

@@ -98 +98 @@
                 /** HashMap for keeping track in which sequence which replacement has been performed.
                  *  Neccessary for updating the indices of other occurrences accordingly */
-                public HashMap<Integer, List<MatchOccurence>> replacedOccurences;
+                private HashMap<Integer, List<MatchOccurence>> replacedOccurences;
 
                 /** The list of all found matches */
-                public LinkedList<Match> matchseqs;
+                private LinkedList<Match> matchseqs;
 
                 /** The generated NumberSequences. 
@@ -515 +515 @@
                         executor.awaitTermination(2, TimeUnit.HOURS);
                 } catch (final InterruptedException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }
@@ -578 +577 @@
         /**
          * <p>
-         * TODO clarify why this is done
+         * TODO clarify why this is done (in fact, ask Patrick Harms)
          * </p>.
          *
@@ -646 +645 @@
          * Match as sequence.
          *
-         * @param appData            , Ruleapplication Data needed to keep track of all created
-         *            tasks
-         * @param m            The match to be converted into a Task
-         * @return The task of the match with an ISequence as it's root
+         * @param appData               RuleApplicationData needed to keep track of all created tasks 
+         * @param m                             The match to be converted into a Task
+         * @return                              The task of the match with an ISequence as its root
          */
         synchronized public ISequence matchAsSequence(RuleApplicationData appData,
@@ -692 +690 @@
                         }
                         // Both tasks are not equal, we need to insert a selection here.
-                        // Check if the next position is not a selection
+                        // Now things get complicated. We first need to check 
+                        // if the next position is not a selection. Then we can just create a selection
+                        // of the both Tasks
+                        // In the other case (more than one selection following this selection), we want to 
+                        // create a selection of sequences where each sequence gets the corresponding task of 
+                        // the its sequence in the pattern.
+                        //
                         else if (i < (first.length - 1)) {
 
@@ -840 +844 @@
          */
         private void replaceMatches(RuleApplicationData appData) {
-                appData.replacedOccurences = new HashMap<Integer, List<MatchOccurence>>();
+                appData.setReplacedOccurences(new HashMap<Integer, List<MatchOccurence>>());
 
                 final int matchSeqSize = appData.getMatchseqs().size();
@@ -914 +918 @@
                                                 + " threads");
                 // Prepare parallel search of matchseqs
-
                 final int matchSeqSize = appData.getMatchseqs().size();
                 int newThreads = nThreads;
@@ -1135 +1138 @@
                                                                 }
                                                         }
-                                                        System.out.println("Replacing in sequence"
-                                                                        + oc.getSequenceId());
                                                         synchronized (appData) {
                                                                 appData.detectedAndReplacedTasks = true;
@@ -1156 +1157 @@
                                                 // length of
                                                 // instance. (OptionalInstances may be shorter)
-
                                                 synchronized (appData.getReplacedOccurrences().get(
                                                                 oc.getSequenceId())) {