Changeset 1294 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation
- Timestamp:
- 08/14/13 17:04:42 (11 years ago)
- Location:
- trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/AbstractTemporalRelationshipTC.java
r1281 r1294 33 33 import de.ugoe.cs.autoquest.tasktrees.TaskTreeValidator; 34 34 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality; 35 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance; 35 36 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList; 36 37 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder; … … 74 75 * 75 76 */ 76 protected void applyRule(Class<? extends ITaskInstance ListScopeRule> ruleClass,77 String 78 String 77 protected void applyRule(Class<? extends ITaskInstanceScopeRule> ruleClass, 78 String inputSpec, 79 String expectedOutputSpec) 79 80 { 80 ITaskInstance ListScopeRule rule = null;81 ITaskInstanceScopeRule rule = null; 81 82 82 83 CONSTRUCTOR_ITERATION: … … 100 101 101 102 try { 102 rule = (ITaskInstance ListScopeRule) constructor.newInstance(parameters.toArray());103 rule = (ITaskInstanceScopeRule) constructor.newInstance(parameters.toArray()); 103 104 } 104 105 catch (IllegalArgumentException e) { … … 127 128 RuleApplicationStatus status; 128 129 129 ITaskInstance List inputList =decoder.decode(inputSpec);130 131 Stack<ITaskInstance List> toBeAppliedOn = new Stack<ITaskInstanceList>();130 ITaskInstance inputList = (ITaskInstance) decoder.decode(inputSpec); 131 132 Stack<ITaskInstance> toBeAppliedOn = new Stack<ITaskInstance>(); 132 133 toBeAppliedOn.push(inputList); 133 134 … … 156 157 while ((!toBeAppliedOn.isEmpty()) || (status == RuleApplicationStatus.FINISHED)); 157 158 158 ITaskInstance List expectedList =decoder.decode(expectedOutputSpec);159 160 new TaskTreeChecker().assertTaskInstance ListsEqual(expectedList, inputList);159 ITaskInstance expectedList = (ITaskInstance) decoder.decode(expectedOutputSpec); 160 161 new TaskTreeChecker().assertTaskInstancesEqual(expectedList, inputList); 161 162 } 162 163 -
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskInstanceTrieTest.java
r1285 r1294 1510 1510 int order = 3; 1511 1511 1512 TaskInstanceTrieTester tester = new TaskInstanceTrieTester(1000, 100000 0, order);1513 1514 long start = System.currentTimeMillis(); 1515 fixture.trainSessions(Arrays.asList(tester.userSession), order); 1516 System.out.println("testing session with 100000 0task instances and 1000 symbols took " +1512 TaskInstanceTrieTester tester = new TaskInstanceTrieTester(1000, 100000, order); 1513 1514 long start = System.currentTimeMillis(); 1515 fixture.trainSessions(Arrays.asList(tester.userSession), order); 1516 System.out.println("testing session with 100000 task instances and 1000 symbols took " + 1517 1517 (System.currentTimeMillis() - start) + "ms"); 1518 1518 -
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolBucketedMapTest.java
r1285 r1294 28 28 import org.junit.Test; 29 29 30 import de.ugoe.cs.autoquest.eventcore.Event; 30 31 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality; 32 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; 33 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; 31 34 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 32 35 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; … … 60 63 @Test 61 64 public void testSymbolMap_1() { 62 SymbolMap<ITaskInstance, String> symbolMap = 63 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));65 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 66 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 64 67 65 68 assertNotNull(symbolMap); … … 69 72 @Test 70 73 public void testSymbolMap_2() { 71 TaskSymbolBucketedMap<String> symbolMap1 = 72 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));74 TaskSymbolBucketedMap<String> symbolMap1 = new TaskSymbolBucketedMap<String> 75 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 73 76 74 77 ITaskInstance taskInstance = createTaskInstance("symbol"); … … 89 92 @Test 90 93 public void testAddSymbol_1() { 91 SymbolMap<ITaskInstance, String> symbolMap = 92 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));94 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 95 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 93 96 94 97 ITaskInstance taskInstance = createTaskInstance("symbol"); … … 102 105 @Test 103 106 public void testAddSymbol_2() { 104 SymbolMap<ITaskInstance, String> symbolMap = 105 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));107 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 108 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 106 109 107 110 int entryCount = 2000; … … 122 125 @Test 123 126 public void testAddSymbol_3() { 124 SymbolMap<ITaskInstance, String> symbolMap = 125 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));127 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 128 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 126 129 127 130 int entryCount = 2000; … … 148 151 @Test(expected = java.lang.IllegalArgumentException.class) 149 152 public void testAddSymbol_4() { 150 SymbolMap<ITaskInstance, String> symbolMap = 151 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));153 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 154 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 152 155 153 156 symbolMap.addSymbol(null, null); … … 156 159 @Test 157 160 public void testSize_1() { 158 SymbolMap<ITaskInstance, String> symbolMap = 159 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));161 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 162 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 160 163 161 164 assertEquals(0, symbolMap.size()); … … 164 167 @Test 165 168 public void testSize_2() { 166 SymbolMap<ITaskInstance, String> symbolMap = 167 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));169 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 170 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 168 171 169 172 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 174 177 @Test 175 178 public void testSize_3() { 176 SymbolMap<ITaskInstance, String> symbolMap = 177 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));179 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 180 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 178 181 179 182 int entryCount = 2000; … … 188 191 @Test 189 192 public void testSize_4() { 190 SymbolMap<ITaskInstance, String> symbolMap = 191 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));193 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 194 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 192 195 193 196 int entryCount = 2000; … … 207 210 @Test 208 211 public void testSize_5() { 209 SymbolMap<ITaskInstance, String> symbolMap = 210 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));212 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 213 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 211 214 212 215 int entryCount = 2000; … … 225 228 @Test 226 229 public void testIsEmpty_1() { 227 SymbolMap<ITaskInstance, String> symbolMap = 228 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));230 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 231 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 229 232 230 233 assertTrue(symbolMap.isEmpty()); … … 233 236 @Test 234 237 public void testIsEmpty_2() { 235 SymbolMap<ITaskInstance, String> symbolMap = 236 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));238 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 239 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 237 240 238 241 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 243 246 @Test 244 247 public void testIsEmpty_3() { 245 SymbolMap<ITaskInstance, String> symbolMap = 246 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));248 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 249 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 247 250 248 251 int entryCount = 2000; … … 257 260 @Test 258 261 public void testIsEmpty_4() { 259 SymbolMap<ITaskInstance, String> symbolMap = 260 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));262 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 263 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 261 264 262 265 int entryCount = 2000; … … 276 279 @Test 277 280 public void testIsEmpty_5() { 278 SymbolMap<ITaskInstance, String> symbolMap = 279 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));281 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 282 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 280 283 281 284 int entryCount = 2000; … … 294 297 @Test 295 298 public void testContainsSymbol_1() { 296 SymbolMap<ITaskInstance, String> symbolMap = 297 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));299 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 300 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 298 301 299 302 assertFalse(symbolMap.containsSymbol(createTaskInstance("symbol"))); … … 302 305 @Test 303 306 public void testContainsSymbol_2() { 304 SymbolMap<ITaskInstance, String> symbolMap = 305 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));307 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 308 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 306 309 307 310 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 312 315 @Test 313 316 public void testContainsSymbol_3() { 314 SymbolMap<ITaskInstance, String> symbolMap = 315 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));317 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 318 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 316 319 317 320 int entryCount = 2000; … … 328 331 @Test 329 332 public void testContainsSymbol_4() { 330 SymbolMap<ITaskInstance, String> symbolMap = 331 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));333 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 334 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 332 335 333 336 int entryCount = 2000; … … 349 352 @Test 350 353 public void testContainsSymbol_5() { 351 SymbolMap<ITaskInstance, String> symbolMap = 352 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));354 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 355 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 353 356 354 357 int entryCount = 2000; … … 377 380 @Test(expected = java.lang.IllegalArgumentException.class) 378 381 public void testContainsSymbol_6() { 379 SymbolMap<ITaskInstance, String> symbolMap = 380 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));382 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 383 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 381 384 382 385 symbolMap.containsSymbol(null); … … 385 388 @Test 386 389 public void testGetValue_1() { 387 SymbolMap<ITaskInstance, String> symbolMap = 388 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));390 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 391 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 389 392 390 393 assertNull(symbolMap.getValue(createTaskInstance("symbol"))); … … 393 396 @Test 394 397 public void testGetValue_2() { 395 SymbolMap<ITaskInstance, String> symbolMap = 396 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));398 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 399 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 397 400 398 401 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 403 406 @Test 404 407 public void testGetValue_3() { 405 SymbolMap<ITaskInstance, String> symbolMap = 406 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));408 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 409 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 407 410 408 411 symbolMap.addSymbol(createTaskInstance("symbol1"), null); … … 413 416 @Test 414 417 public void testGetValue_4() { 415 SymbolMap<ITaskInstance, String> symbolMap = 416 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));418 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 419 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 417 420 418 421 int entryCount = 2000; … … 429 432 @Test 430 433 public void testGetValue_5() { 431 SymbolMap<ITaskInstance, String> symbolMap = 432 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));434 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 435 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 433 436 434 437 int entryCount = 2000; … … 455 458 @Test 456 459 public void testGetValue_6() { 457 SymbolMap<ITaskInstance, String> symbolMap = 458 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));460 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 461 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 459 462 460 463 int entryCount = 2000; … … 483 486 @Test(expected = java.lang.IllegalArgumentException.class) 484 487 public void testGetValue_7() { 485 SymbolMap<ITaskInstance, String> symbolMap = 486 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));488 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 489 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 487 490 488 491 symbolMap.getValue(null); … … 491 494 @Test 492 495 public void testRemoveSymbol_1() { 493 SymbolMap<ITaskInstance, String> symbolMap = 494 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));496 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 497 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 495 498 496 499 assertNull(symbolMap.removeSymbol(createTaskInstance("symbol"))); … … 499 502 @Test 500 503 public void testRemoveSymbol_2() { 501 SymbolMap<ITaskInstance, String> symbolMap = 502 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));504 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 505 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 503 506 504 507 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 510 513 @Test 511 514 public void testRemoveSymbol_3() { 512 SymbolMap<ITaskInstance, String> symbolMap = 513 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));515 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 516 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 514 517 515 518 symbolMap.addSymbol(createTaskInstance("symbol1"), null); … … 521 524 @Test 522 525 public void testRemoveSymbol_4() { 523 SymbolMap<ITaskInstance, String> symbolMap = 524 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));526 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 527 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 525 528 526 529 int entryCount = 2000; … … 539 542 @Test 540 543 public void testRemoveSymbol_5() { 541 SymbolMap<ITaskInstance, String> symbolMap = 542 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));544 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 545 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 543 546 544 547 int entryCount = 2000; … … 567 570 @Test 568 571 public void testRemoveSymbol_6() { 569 SymbolMap<ITaskInstance, String> symbolMap = 570 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));572 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 573 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 571 574 572 575 int entryCount = 2000; … … 597 600 @Test(expected = java.lang.IllegalArgumentException.class) 598 601 public void testRemoveSymbol_7() { 599 SymbolMap<ITaskInstance, String> symbolMap = 600 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));602 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 603 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 601 604 602 605 symbolMap.removeSymbol(null); … … 605 608 @Test 606 609 public void testGetSymbols_1() { 607 SymbolMap<ITaskInstance, String> symbolMap = 608 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));610 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 611 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 609 612 610 613 assertNotNull(symbolMap.getSymbols()); … … 614 617 @Test 615 618 public void testGetSymbols_2() { 616 SymbolMap<ITaskInstance, String> symbolMap = 617 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));619 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 620 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 618 621 619 622 ITaskInstance task = createTaskInstance("symbol1"); … … 627 630 @Test 628 631 public void testGetSymbols_3() { 629 SymbolMap<ITaskInstance, String> symbolMap = 630 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));632 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 633 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 631 634 632 635 ITaskInstance task = createTaskInstance("symbol1"); … … 640 643 @Test 641 644 public void testGetSymbols_4() { 642 SymbolMap<ITaskInstance, String> symbolMap = 643 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));645 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 646 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 644 647 Set<ITaskInstance> expectedSymbols = new HashSet<ITaskInstance>(); 645 648 … … 667 670 @Test 668 671 public void testGetSymbols_5() { 669 SymbolMap<ITaskInstance, String> symbolMap = 670 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));672 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 673 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 671 674 Set<ITaskInstance> expectedSymbols = new HashSet<ITaskInstance>(); 672 675 … … 701 704 @Test 702 705 public void testGetSymbols_6() { 703 SymbolMap<ITaskInstance, String> symbolMap = 704 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));706 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 707 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 705 708 List<ITaskInstance> expectedSymbols = new ArrayList<ITaskInstance>(); 706 709 … … 732 735 @Test 733 736 public void testGetValues_1() { 734 SymbolMap<ITaskInstance, String> symbolMap = 735 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));737 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 738 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 736 739 737 740 assertNotNull(symbolMap.getValues()); … … 741 744 @Test 742 745 public void testGetValues_2() { 743 SymbolMap<ITaskInstance, String> symbolMap = 744 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));746 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 747 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 745 748 746 749 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 753 756 @Test 754 757 public void testGetValues_3() { 755 SymbolMap<ITaskInstance, String> symbolMap = 756 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));758 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 759 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 757 760 758 761 symbolMap.addSymbol(createTaskInstance("symbol1"), null); … … 765 768 @Test 766 769 public void testGetValues_4() { 767 SymbolMap<ITaskInstance, String> symbolMap = 768 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));770 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 771 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 769 772 Set<String> expectedValues = new HashSet<String>(); 770 773 … … 791 794 @Test 792 795 public void testGetValues_5() { 793 SymbolMap<ITaskInstance, String> symbolMap = 794 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));796 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 797 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 795 798 Set<String> expectedValues = new HashSet<String>(); 796 799 … … 823 826 @Test 824 827 public void testGetValues_6() { 825 SymbolMap<ITaskInstance, String> symbolMap = 826 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));828 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 829 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 827 830 Set<String> expectedValues = new HashSet<String>(); 828 831 … … 854 857 @Test 855 858 public void testClear_1() { 856 SymbolMap<ITaskInstance, String> symbolMap = 857 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));859 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 860 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 858 861 859 862 symbolMap.clear(); … … 863 866 @Test 864 867 public void testClear_2() { 865 SymbolMap<ITaskInstance, String> symbolMap = 866 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));868 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 869 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 867 870 868 871 symbolMap.addSymbol(createTaskInstance("symbol1"), "value1"); … … 874 877 @Test 875 878 public void testClear_3() { 876 SymbolMap<ITaskInstance, String> symbolMap = 877 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));879 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 880 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 878 881 879 882 symbolMap.addSymbol(createTaskInstance("symbol1"), null); … … 885 888 @Test 886 889 public void testClear_4() { 887 SymbolMap<ITaskInstance, String> symbolMap = 888 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));890 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 891 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 889 892 890 893 int entryCount = 2000; … … 900 903 @Test 901 904 public void testClear_5() { 902 SymbolMap<ITaskInstance, String> symbolMap = 903 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));905 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 906 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 904 907 905 908 int entryCount = 2000; … … 920 923 @Test 921 924 public void testClear_6() { 922 SymbolMap<ITaskInstance, String> symbolMap = 923 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));925 SymbolMap<ITaskInstance, String> symbolMap = new TaskSymbolBucketedMap<String> 926 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 924 927 925 928 int entryCount = 2000; … … 939 942 @Test 940 943 public void testEquals_1() { 941 SymbolMap<ITaskInstance, String> symbolMap1 = 942 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));943 944 SymbolMap<ITaskInstance, String> symbolMap2 = 945 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));944 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 945 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 946 947 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 948 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 946 949 947 950 assertTrue(symbolMap1.equals(symbolMap2)); … … 950 953 @Test 951 954 public void testEquals_2() { 952 SymbolMap<ITaskInstance, String> symbolMap1 = 953 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));954 955 SymbolMap<ITaskInstance, String> symbolMap2 = 956 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));955 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 956 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 957 958 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 959 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 957 960 958 961 symbolMap1.addSymbol(createTaskInstance("symbol1"), "value1"); … … 963 966 @Test 964 967 public void testEquals_3() { 965 SymbolMap<ITaskInstance, String> symbolMap1 = 966 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));967 968 SymbolMap<ITaskInstance, String> symbolMap2 = 969 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));968 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 969 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 970 971 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 972 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 970 973 971 974 ITaskInstance task = createTaskInstance("symbol1"); … … 978 981 @Test 979 982 public void testEquals_4() { 980 SymbolMap<ITaskInstance, String> symbolMap1 = 981 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));983 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 984 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 982 985 983 SymbolMap<ITaskInstance, String> symbolMap2 = 984 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));986 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 987 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 985 988 986 989 int entryCount = 1000; … … 997 1000 @Test 998 1001 public void testEquals_5() { 999 SymbolMap<ITaskInstance, String> symbolMap1 = 1000 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));1002 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 1003 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1001 1004 1002 SymbolMap<ITaskInstance, String> symbolMap2 = 1003 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));1005 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 1006 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1004 1007 1005 1008 int entryCount = 1000; … … 1024 1027 @Test 1025 1028 public void testEquals_6() { 1026 SymbolMap<ITaskInstance, String> symbolMap1 = 1027 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));1029 SymbolMap<ITaskInstance, String> symbolMap1 = new TaskSymbolBucketedMap<String> 1030 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1028 1031 1029 SymbolMap<ITaskInstance, String> symbolMap2 = 1030 new TaskSymbolBucketedMap<String>(new TaskComparator(TaskEquality.SEMANTICALLY_EQUAL));1032 SymbolMap<ITaskInstance, String> symbolMap2 = new TaskSymbolBucketedMap<String> 1033 (new TaskInstanceComparator(TaskEquality.SEMANTICALLY_EQUAL)); 1031 1034 1032 1035 int entryCount = 1000; … … 1052 1055 1053 1056 /** 1054 * <p>1055 * TODO: comment1056 * </p>1057 1057 * 1058 * @param string1059 * @return1060 1058 */ 1061 1059 private ITaskInstance createTaskInstance(String id) { 1062 1060 ITask task = tasks.get(id); 1063 1061 Event event = null; 1062 1064 1063 if (task == null) { 1065 task = taskFactory.createNewEventTask1066 (new DummyInteraction(id, 0), new DummyGUIElement("default"));1067 1064 event = new Event(new DummyInteraction(id, 0), new DummyGUIElement("default")); 1065 task = taskFactory.createNewEventTask(event.toString()); 1066 1068 1067 tasks.put(id, task); 1069 1068 } 1070 1071 return taskFactory.createNewTaskInstance(task); 1069 else { 1070 event = ((IEventTaskInstance) task.getInstances().iterator().next()).getEvent(); 1071 } 1072 1073 return taskFactory.createNewTaskInstance((IEventTask) task, event); 1072 1074 } 1073 1075 -
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolIdentityMapTest.java
r1285 r1294 28 28 import org.junit.Test; 29 29 30 import de.ugoe.cs.autoquest.eventcore.Event; 31 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; 32 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; 30 33 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 31 34 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; … … 1054 1057 " took " + (System.currentTimeMillis() - start)); 1055 1058 } 1059 1056 1060 /** 1057 * <p>1058 * TODO: comment1059 * </p>1060 1061 * 1061 * @param string1062 * @return1063 1062 */ 1064 1063 private ITaskInstance createTaskInstance(String id) { 1065 1064 ITask task = tasks.get(id); 1065 Event event = null; 1066 1066 1067 1067 if (task == null) { 1068 task = taskFactory.createNewEventTask1069 (new DummyInteraction(id, 0), new DummyGUIElement("default"));1068 event = new Event(new DummyInteraction(id, 0), new DummyGUIElement("default")); 1069 task = taskFactory.createNewEventTask(event.toString()); 1070 1070 1071 1071 tasks.put(id, task); 1072 1072 } 1073 1074 return taskFactory.createNewTaskInstance(task); 1073 else { 1074 event = ((IEventTaskInstance) task.getInstances().iterator().next()).getEvent(); 1075 } 1076 1077 return taskFactory.createNewTaskInstance((IEventTask) task, event); 1075 1078 } 1076 1079
Note: See TracChangeset
for help on using the changeset viewer.