Changeset 1155 for trunk

Timestamp:

04/19/13 17:11:46 (12 years ago)

Author:

pharms

Message:

• removed find bugs warnings

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRule.java (modified) (9 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRule.java

@@ -167 +167 @@
         for (IUserSession session : sessions) {
             for (int i = 0; i < (session.size() - 1); i++) {
-                if (taskComparator.equals(session.get(i).getTask(), session.get(i + 1).getTask())) {
+                if (taskComparator.equals(session.get(i), session.get(i + 1))) {
                     return session.get(i).getTask();
                 }
@@ -175 +175 @@
         return null;
     }
+
+    /**
+     *
+     */
+/*    private ITask searchIteratedTask(List<IUserSession> sessions) {
+        int minNoOfRepetitions = 2;
+        int minNoOfIterationOccurrences = 1;
+        
+        Map<ITask, Integer> iterationsCounter = new HashMap<ITask, Integer>();
+        
+        for (IUserSession session : sessions) {
+            for (int i = 0; i < (session.size() - minNoOfRepetitions + 1); i++) {
+                ITask task = session.get(i).getTask();
+
+                // check if the task is iterated
+                boolean isIterated = true;
+                for (int j = i + 1; j < i + minNoOfRepetitions; j++) {
+                    if (!taskComparator.equals(task, session.get(j).getTask())) {
+                        isIterated = false;
+                        break;
+                    }
+                }
+                
+                if (isIterated) {
+                    Integer currentCounter = null;
+                    
+                    for (Map.Entry<ITask, Integer> entry : iterationsCounter.entrySet()) {
+                        if (taskComparator.equals(task, entry.getKey())) {
+                            currentCounter = entry.getValue();
+                            break;
+                        }
+                    }
+                    
+                    if (currentCounter == null) {
+                        currentCounter = 1;
+                        iterationsCounter.put(task, currentCounter);
+                    }
+                    else {
+                        currentCounter++;
+                        iterationsCounter.put(task, currentCounter);
+                    }
+                    
+                    if (currentCounter >= minNoOfIterationOccurrences) {
+                        return task;
+                    }
+                }
+            }
+        }
+        
+        return null;
+    }*/
 
     /**
@@ -215 +266 @@
 
     /**
-     * <p>
-     * TODO: comment
-     * </p>
      *
-     * @param iteratedTaskVariants
      */
     private void harmonizeIterationInstancesModel(IIteration          iteration,
@@ -839 +886 @@
      *
      */
-    private class TaskComparator implements SymbolComparator<ITaskInstance> {
+    private static class TaskComparator implements SymbolComparator<ITaskInstance> {
 
         /** */
@@ -949 +996 @@
      * 
      */
-    private interface Comparer {
+    private static interface Comparer {
         
         /**
@@ -960 +1007 @@
      * 
      */
-    private class LexicalComparer implements Comparer {
+    private static class LexicalComparer implements Comparer {
         
         /**
@@ -987 +1034 @@
      * 
      */
-    private class SyntacticalComparer implements Comparer {
+    private static class SyntacticalComparer implements Comparer {
         
         /**
@@ -1014 +1061 @@
      * 
      */
-    private class SemanticalComparer implements Comparer {
+    private static class SemanticalComparer implements Comparer {
         
         /**
@@ -1041 +1088 @@
      * 
      */
-    private class DefaultComparer implements Comparer {
+    private static class DefaultComparer implements Comparer {
         
         /**