Changeset 1096

Timestamp:

02/20/13 11:16:57 (12 years ago)

Author:

pharms

Message:

• correction in the task splitting

Location:

trunk

Files:

• autoquest-ui-core-test/src/test/java/de/ugoe/cs/autoquest/ui/CMDmergeSequencesTest.java (modified) (3 diffs)
• autoquest-ui-core-test/src/test/java/de/ugoe/cs/autoquest/ui/CMDsplitSequencesTest.java (modified) (2 diffs)
• autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDsplitSequences.java (modified) (2 diffs)

trunk/autoquest-ui-core-test/src/test/java/de/ugoe/cs/autoquest/ui/CMDmergeSequencesTest.java

@@ -56 +56 @@
         IEventType type = mock(IEventType.class);
         
-        Collection<List<Event>> sequences = new LinkedList<List<Event>>();
+        List<List<Event>> sequences = new LinkedList<List<Event>>();
         
         for (int i = 0; i < 5; i++) {
@@ -67 +67 @@
             }
             
-            sequences.add(sequence);
+            if (i % 2 == 0) {
+                sequences.add(sequence);
+            }
+            else {
+                sequences.add(0, sequence);
+            }
         }
         
@@ -78 +83 @@
         assertTrue(result instanceof Collection<?>);
         
-        sequences = (Collection<List<Event>>) result;
+        sequences = (List<List<Event>>) result;
         
         assertEquals(1, sequences.size());

trunk/autoquest-ui-core-test/src/test/java/de/ugoe/cs/autoquest/ui/CMDsplitSequencesTest.java

@@ -63 +63 @@
             for (int j = 0; j < 10; j++) {
                 Event event = new Event(type);
-                event.setTimestamp(((i + 1) * 50) + (j * 10));
+                
+                if (j < 3) {
+                    event.setTimestamp(((i + 1) * 50) + j);
+                }
+                else if (j < 7) {
+                    event.setTimestamp(((i + 1) * 50) + j + 15);
+                }
+                else {
+                    event.setTimestamp(((i + 1) * 50) + j + 30);
+                }
+                
                 sequence.add(event);
             }
@@ -80 +90 @@
         sequences = (Collection<List<Event>>) result;
         
-        assertEquals(50, sequences.size());
+        assertEquals(15, sequences.size());
         
         for (List<Event> sequence : sequences) {
             assertNotNull(sequence);
-            assertEquals(1, sequence.size());
+            assertTrue((sequence.size() == 3) || (sequence.size() == 4));
         }
     }

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDsplitSequences.java

@@ -91 +91 @@
                 }
                 
-                if (previous == null) {
-                    previous = currentEvent;
-                }
-                else if (Math.abs(previous.getTimestamp() - currentEvent.getTimestamp()) > diff) {
+                if ((previous != null) &&
+                    (Math.abs(previous.getTimestamp() - currentEvent.getTimestamp()) > diff))
+                {
                     newSequences.add(resultingSequence);
                     resultingSequence = new LinkedList<Event>();
@@ -100 +99 @@
                 
                 resultingSequence.add(currentEvent);
+                previous = currentEvent;
             }