Changeset 1657 for branches/autoquest-core-tasktrees-alignment-test

Timestamp:

08/11/14 08:22:13 (10 years ago)

Author:

rkrimmel

Message:

About to fix bug in containsPattern

File:

• branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java (modified) (3 diffs)

branches/autoquest-core-tasktrees-alignment-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequenceTest.java

@@ -13 +13 @@
                         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 +37 @@
                 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 +116 @@
                 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));
+                
+                
+                
         }