Changeset 1846 for trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskInstanceTrieTest.java
- Timestamp:
- 12/23/14 10:55:46 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskInstanceTrieTest.java
r1294 r1846 26 26 import de.ugoe.cs.autoquest.tasktrees.TaskTreeDecoder; 27 27 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality; 28 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 28 29 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder; 29 30 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory; 30 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;31 31 import de.ugoe.cs.autoquest.tasktrees.treeifc.IUserSession; 32 32 import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskBuilder; … … 114 114 fixture.trainSessions(Arrays.asList(session), 2); 115 115 116 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0) )));117 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1) )));118 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2) )));116 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 117 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 118 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 119 119 120 120 // subsequences of length 1 are not trained. So for the single item sequence of the last 121 121 // task, the count must be 0 122 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3)))); 123 124 125 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 126 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 127 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 122 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 123 124 125 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 126 session.get(1).getTask()))); 127 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 128 session.get(2).getTask()))); 129 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask(), 130 session.get(3).getTask()))); 128 131 129 132 // this must return 0 as we only trained shorter sequences 130 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 131 session.get(2)))); 133 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 134 session.get(1).getTask(), 135 session.get(2).getTask()))); 132 136 133 137 // subsequences of length 1 are not trained. So the single item sequence of the last … … 153 157 // subsequences of length 1 are not trained. So the single item sequence of the last 154 158 // task is not counted. Therefore, the result must be 3 155 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i) )));159 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask()))); 156 160 157 161 for (int j = 0; j < session.size(); j++) { 158 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i), session.get(j)))); 162 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask(), 163 session.get(j).getTask()))); 159 164 } 160 165 } 161 166 162 167 // this must return 0 as we only trained shorter sequences 163 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 164 session.get(2)))); 168 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 169 session.get(1).getTask(), 170 session.get(2).getTask()))); 165 171 166 172 assertEquals(1, fixture.getNumSymbols()); … … 183 189 // subsequences of length 1 are not trained. So the single item sequence of the last 184 190 // task is not counted. Therefore, the result must be 3 185 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0)))); 186 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1)))); 187 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2)))); 188 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3)))); 189 190 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 191 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 192 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 191 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 192 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 193 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 194 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 195 196 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask(), 197 session.get(1).getTask()))); 198 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 199 session.get(2).getTask()))); 200 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask(), 201 session.get(3).getTask()))); 193 202 194 203 // this must return 0 as we only trained shorter sequences 195 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 196 session.get(2)))); 204 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 205 session.get(1).getTask(), 206 session.get(2).getTask()))); 197 207 198 208 assertEquals(2, fixture.getNumSymbols()); … … 213 223 fixture.trainSessions(Arrays.asList(session), 3); 214 224 215 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0) )));216 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1) )));217 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2) )));225 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 226 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 227 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 218 228 219 229 // subsequences of length 1 are not trained. So for the single item sequence of the last 220 230 // task, the count must be 0 221 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3)))); 222 223 224 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 225 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 226 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 227 228 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 229 session.get(2)))); 230 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2), 231 session.get(3)))); 231 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 232 233 234 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 235 session.get(1).getTask()))); 236 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 237 session.get(2).getTask()))); 238 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask(), 239 session.get(3).getTask()))); 240 241 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 242 session.get(1).getTask(), 243 session.get(2).getTask()))); 244 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 245 session.get(2).getTask(), 246 session.get(3).getTask()))); 232 247 233 248 // we only trained shorter sequences, so we expect a count of 0 for longer ones 234 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 235 session.get(2), session.get(3)))); 249 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 250 session.get(1).getTask(), 251 session.get(2).getTask(), 252 session.get(3).getTask()))); 236 253 237 254 // subsequences of length 1 are not trained. So the single item sequence of the last … … 257 274 // subsequences of length 1 are not trained. So the single item sequence of the last 258 275 // task is not counted. Therefore, the result must be 3 259 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i) )));276 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask()))); 260 277 261 278 for (int j = 0; j < session.size(); j++) { 262 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i), session.get(j)))); 279 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask(), 280 session.get(j).getTask()))); 263 281 264 282 for (int k = 0; k < session.size(); k++) { 265 assertEquals(2, fixture.getCount(Arrays.asList(session.get(i), session.get(j), 266 session.get(k)))); 283 assertEquals(2, fixture.getCount(Arrays.asList(session.get(i).getTask(), 284 session.get(j).getTask(), 285 session.get(k).getTask()))); 267 286 } 268 287 } … … 270 289 271 290 // we only trained shorter sequences, so we expect a count of 0 for longer ones 272 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 273 session.get(2), session.get(3)))); 291 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 292 session.get(1).getTask(), 293 session.get(2).getTask(), 294 session.get(3).getTask()))); 274 295 275 296 assertEquals(1, fixture.getNumSymbols()); … … 292 313 // subsequences of length 1 are not trained. So the single item sequence of the last 293 314 // task is not counted. Therefore, the result must be 3 294 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0)))); 295 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1)))); 296 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2)))); 297 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3)))); 298 299 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 300 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 301 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 302 303 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 304 session.get(2)))); 305 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2), 306 session.get(3)))); 315 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 316 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 317 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 318 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 319 320 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask(), 321 session.get(1).getTask()))); 322 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 323 session.get(2).getTask()))); 324 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask(), 325 session.get(3).getTask()))); 326 327 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 328 session.get(1).getTask(), 329 session.get(2).getTask()))); 330 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 331 session.get(2).getTask(), 332 session.get(3).getTask()))); 307 333 308 334 // we only trained shorter sequences, so we expect a count of 0 for longer ones 309 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 310 session.get(2), session.get(3)))); 335 assertEquals(0, fixture.getCount(Arrays.asList(session.get(0).getTask(), 336 session.get(1).getTask(), 337 session.get(2).getTask(), 338 session.get(3).getTask()))); 311 339 312 340 assertEquals(2, fixture.getNumSymbols()); … … 327 355 fixture.trainSessions(Arrays.asList(session), 4); 328 356 329 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0) )));330 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1) )));331 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2) )));357 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 358 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 359 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 332 360 333 361 // subsequences of length 1 are not trained. So for the single item sequence of the last 334 362 // task, the count must be 0 335 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3)))); 336 337 338 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 339 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 340 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 341 342 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 343 session.get(2)))); 344 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2), 345 session.get(3)))); 363 assertEquals(0, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 364 365 366 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 367 session.get(1).getTask()))); 368 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 369 session.get(2).getTask()))); 370 assertEquals(1, fixture.getCount(Arrays.asList(session.get(2).getTask(), 371 session.get(3).getTask()))); 372 373 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 374 session.get(1).getTask(), 375 session.get(2).getTask()))); 376 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 377 session.get(2).getTask(), 378 session.get(3).getTask()))); 346 379 347 380 // we only trained shorter sequences, so we expect a count of 0 for longer ones 348 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 349 session.get(2), session.get(3)))); 381 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 382 session.get(1).getTask(), 383 session.get(2).getTask(), 384 session.get(3).getTask()))); 350 385 351 386 // subsequences of length 1 are not trained. So the single item sequence of the last … … 371 406 // subsequences of length 1 are not trained. So the single item sequence of the last 372 407 // task is not counted. Therefore, the result must be 3 373 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i) )));408 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask()))); 374 409 375 410 for (int j = 0; j < session.size(); j++) { 376 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i), session.get(j)))); 411 assertEquals(3, fixture.getCount(Arrays.asList(session.get(i).getTask(), 412 session.get(j).getTask()))); 377 413 378 414 for (int k = 0; k < session.size(); k++) { 379 assertEquals(2, fixture.getCount(Arrays.asList(session.get(i), session.get(j), 380 session.get(k)))); 415 assertEquals(2, fixture.getCount(Arrays.asList(session.get(i).getTask(), 416 session.get(j).getTask(), 417 session.get(k).getTask()))); 381 418 } 382 419 } … … 384 421 385 422 // we only trained shorter sequences, so we expect a count of 0 for longer ones 386 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 387 session.get(2), session.get(3)))); 423 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 424 session.get(1).getTask(), 425 session.get(2).getTask(), 426 session.get(3).getTask()))); 388 427 389 428 assertEquals(1, fixture.getNumSymbols()); … … 406 445 // subsequences of length 1 are not trained. So the single item sequence of the last 407 446 // task is not counted. Therefore, the result must be 3 408 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0)))); 409 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1)))); 410 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2)))); 411 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3)))); 412 413 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0), session.get(1)))); 414 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2)))); 415 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2), session.get(3)))); 416 417 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 418 session.get(2)))); 419 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1), session.get(2), 420 session.get(3)))); 447 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask()))); 448 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask()))); 449 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask()))); 450 assertEquals(1, fixture.getCount(Arrays.asList(session.get(3).getTask()))); 451 452 assertEquals(2, fixture.getCount(Arrays.asList(session.get(0).getTask(), 453 session.get(1).getTask()))); 454 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 455 session.get(2).getTask()))); 456 assertEquals(2, fixture.getCount(Arrays.asList(session.get(2).getTask(), 457 session.get(3).getTask()))); 458 459 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 460 session.get(1).getTask(), 461 session.get(2).getTask()))); 462 assertEquals(1, fixture.getCount(Arrays.asList(session.get(1).getTask(), 463 session.get(2).getTask(), 464 session.get(3).getTask()))); 421 465 422 466 // we only trained shorter sequences, so we expect a count of 0 for longer ones 423 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0), session.get(1), 424 session.get(2), session.get(3)))); 467 assertEquals(1, fixture.getCount(Arrays.asList(session.get(0).getTask(), 468 session.get(1).getTask(), 469 session.get(2).getTask(), 470 session.get(3).getTask()))); 425 471 426 472 assertEquals(2, fixture.getNumSymbols()); … … 435 481 436 482 // get all sequences with a minimal length of one that occur most often 437 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 0);483 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 0); 438 484 439 485 assertEquals(1, result.size()); 440 486 441 List<ITask Instance> expected = new ArrayList<ITaskInstance>();442 expected.add(session.get(0) );443 444 assertContains((List<List<ITask Instance>>) result, expected);487 List<ITask> expected = new ArrayList<ITask>(); 488 expected.add(session.get(0).getTask()); 489 490 assertContains((List<List<ITask>>) result, expected); 445 491 } 446 492 … … 452 498 453 499 // get all sequences with a minimal length of one that occur exactly once 454 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 1);500 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 1); 455 501 456 502 assertEquals(11, result.size()); 457 503 458 List<ITask Instance> expected = new ArrayList<ITaskInstance>();459 expected.add(session.get(2) ); //r460 expected.add(session.get(0) ); //a461 expected.add(session.get(4) ); //c504 List<ITask> expected = new ArrayList<ITask>(); 505 expected.add(session.get(2).getTask()); //r 506 expected.add(session.get(0).getTask()); //a 507 expected.add(session.get(4).getTask()); //c 462 508 // rac 463 assertContains((List<List<ITask Instance>>) result, expected);464 465 expected.clear(); 466 expected.add(session.get(0) ); //a467 expected.add(session.get(4) ); //c509 assertContains((List<List<ITask>>) result, expected); 510 511 expected.clear(); 512 expected.add(session.get(0).getTask()); //a 513 expected.add(session.get(4).getTask()); //c 468 514 // ac 469 assertContains((List<List<ITask Instance>>) result, expected);470 471 expected.add(session.get(0) ); //a515 assertContains((List<List<ITask>>) result, expected); 516 517 expected.add(session.get(0).getTask()); //a 472 518 // aca 473 assertContains((List<List<ITask Instance>>) result, expected);474 475 expected.clear(); 476 expected.add(session.get(4) ); //c519 assertContains((List<List<ITask>>) result, expected); 520 521 expected.clear(); 522 expected.add(session.get(4).getTask()); //c 477 523 // c 478 assertContains((List<List<ITask Instance>>) result, expected);479 480 expected.add(session.get(0) ); //a524 assertContains((List<List<ITask>>) result, expected); 525 526 expected.add(session.get(0).getTask()); //a 481 527 // ca 482 assertContains((List<List<ITask Instance>>) result, expected);483 484 expected.add(session.get(6) ); //d528 assertContains((List<List<ITask>>) result, expected); 529 530 expected.add(session.get(6).getTask()); //d 485 531 // cad 486 assertContains((List<List<ITask Instance>>) result, expected);487 488 expected.clear(); 489 expected.add(session.get(0) ); //a490 expected.add(session.get(6) ); //d532 assertContains((List<List<ITask>>) result, expected); 533 534 expected.clear(); 535 expected.add(session.get(0).getTask()); //a 536 expected.add(session.get(6).getTask()); //d 491 537 // ad 492 assertContains((List<List<ITask Instance>>) result, expected);493 494 expected.add(session.get(0) ); //a538 assertContains((List<List<ITask>>) result, expected); 539 540 expected.add(session.get(0).getTask()); //a 495 541 // ada 496 assertContains((List<List<ITask Instance>>) result, expected);497 498 expected.clear(); 499 expected.add(session.get(6) ); //d542 assertContains((List<List<ITask>>) result, expected); 543 544 expected.clear(); 545 expected.add(session.get(6).getTask()); //d 500 546 // d 501 assertContains((List<List<ITask Instance>>) result, expected);502 503 expected.add(session.get(0) ); //a547 assertContains((List<List<ITask>>) result, expected); 548 549 expected.add(session.get(0).getTask()); //a 504 550 // da 505 assertContains((List<List<ITask Instance>>) result, expected);506 507 expected.add(session.get(1) ); //b551 assertContains((List<List<ITask>>) result, expected); 552 553 expected.add(session.get(1).getTask()); //b 508 554 // dab 509 assertContains((List<List<ITask Instance>>) result, expected);555 assertContains((List<List<ITask>>) result, expected); 510 556 } 511 557 … … 517 563 518 564 // get all sequences with a minimal length of one that occur exactly twice 519 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 2);565 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 2); 520 566 521 567 assertEquals(7, result.size()); 522 568 523 List<ITask Instance> expected = new ArrayList<ITaskInstance>();524 expected.add(session.get(0) ); //a525 expected.add(session.get(1) ); //b569 List<ITask> expected = new ArrayList<ITask>(); 570 expected.add(session.get(0).getTask()); //a 571 expected.add(session.get(1).getTask()); //b 526 572 // ab 527 assertContains((List<List<ITask Instance>>) result, expected);528 529 expected.add(session.get(2) ); //r573 assertContains((List<List<ITask>>) result, expected); 574 575 expected.add(session.get(2).getTask()); //r 530 576 // abr 531 assertContains((List<List<ITask Instance>>) result, expected);532 533 expected.clear(); 534 expected.add(session.get(1) ); //b577 assertContains((List<List<ITask>>) result, expected); 578 579 expected.clear(); 580 expected.add(session.get(1).getTask()); //b 535 581 // b 536 assertContains((List<List<ITask Instance>>) result, expected);537 538 expected.add(session.get(2) ); //r582 assertContains((List<List<ITask>>) result, expected); 583 584 expected.add(session.get(2).getTask()); //r 539 585 // br 540 assertContains((List<List<ITask Instance>>) result, expected);541 542 expected.add(session.get(0) ); //a586 assertContains((List<List<ITask>>) result, expected); 587 588 expected.add(session.get(0).getTask()); //a 543 589 // bra 544 assertContains((List<List<ITask Instance>>) result, expected);545 546 expected.clear(); 547 expected.add(session.get(2) ); //r590 assertContains((List<List<ITask>>) result, expected); 591 592 expected.clear(); 593 expected.add(session.get(2).getTask()); //r 548 594 // r 549 assertContains((List<List<ITask Instance>>) result, expected);550 551 expected.add(session.get(0) ); //a595 assertContains((List<List<ITask>>) result, expected); 596 597 expected.add(session.get(0).getTask()); //a 552 598 // ra 553 assertContains((List<List<ITask Instance>>) result, expected);599 assertContains((List<List<ITask>>) result, expected); 554 600 } 555 601 … … 561 607 562 608 // get all sequences with a minimal length of one that occur exactly three times 563 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 3);609 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 3); 564 610 565 611 assertEquals(0, result.size()); … … 573 619 574 620 // get all sequences with a minimal length of one that occur exactly four times 575 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 4);621 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 4); 576 622 577 623 // as we did not train the last single action, we may expect the "a" action only 4 times 578 624 assertEquals(1, result.size()); 579 625 580 List<ITask Instance> expected = new ArrayList<ITaskInstance>();581 expected.add(session.get(0) ); //a582 assertContains((List<List<ITask Instance>>) result, expected);626 List<ITask> expected = new ArrayList<ITask>(); 627 expected.add(session.get(0).getTask()); //a 628 assertContains((List<List<ITask>>) result, expected); 583 629 } 584 630 … … 590 636 591 637 // get all sequences with a minimal length of one that occur exactly five times 592 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(1, 5);638 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(1, 5); 593 639 594 640 // as we did not train the last single action, we may expect the "a" action only 4 times … … 603 649 604 650 // get all sequences with a minimal length of two that occur most often 605 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(2, 0);651 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(2, 0); 606 652 607 653 assertEquals(5, result.size()); 608 654 609 List<ITask Instance> expected = new ArrayList<ITaskInstance>();610 expected.add(session.get(0) ); //a611 expected.add(session.get(1) ); //b612 assertContains((List<List<ITask Instance>>) result, expected);613 614 expected.add(session.get(2) ); //r615 assertContains((List<List<ITask Instance>>) result, expected);616 617 expected.clear(); 618 expected.add(session.get(1) ); //b619 expected.add(session.get(2) ); //r620 assertContains((List<List<ITask Instance>>) result, expected);621 622 expected.add(session.get(0) ); //a623 assertContains((List<List<ITask Instance>>) result, expected);624 625 expected.clear(); 626 expected.add(session.get(2) ); //r627 expected.add(session.get(0) ); //a628 assertContains((List<List<ITask Instance>>) result, expected);655 List<ITask> expected = new ArrayList<ITask>(); 656 expected.add(session.get(0).getTask()); //a 657 expected.add(session.get(1).getTask()); //b 658 assertContains((List<List<ITask>>) result, expected); 659 660 expected.add(session.get(2).getTask()); //r 661 assertContains((List<List<ITask>>) result, expected); 662 663 expected.clear(); 664 expected.add(session.get(1).getTask()); //b 665 expected.add(session.get(2).getTask()); //r 666 assertContains((List<List<ITask>>) result, expected); 667 668 expected.add(session.get(0).getTask()); //a 669 assertContains((List<List<ITask>>) result, expected); 670 671 expected.clear(); 672 expected.add(session.get(2).getTask()); //r 673 expected.add(session.get(0).getTask()); //a 674 assertContains((List<List<ITask>>) result, expected); 629 675 } 630 676 … … 636 682 637 683 // get all sequences with a minimal length of two that occur exactly once 638 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(2, 1);684 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(2, 1); 639 685 640 686 assertEquals(9, result.size()); 641 687 642 List<ITask Instance> expected = new ArrayList<ITaskInstance>();643 expected.add(session.get(2) ); //r644 expected.add(session.get(0) ); //a645 expected.add(session.get(4) ); //c688 List<ITask> expected = new ArrayList<ITask>(); 689 expected.add(session.get(2).getTask()); //r 690 expected.add(session.get(0).getTask()); //a 691 expected.add(session.get(4).getTask()); //c 646 692 // rac 647 assertContains((List<List<ITask Instance>>) result, expected);648 649 expected.clear(); 650 expected.add(session.get(0) ); //a651 expected.add(session.get(4) ); //c693 assertContains((List<List<ITask>>) result, expected); 694 695 expected.clear(); 696 expected.add(session.get(0).getTask()); //a 697 expected.add(session.get(4).getTask()); //c 652 698 // ac 653 assertContains((List<List<ITask Instance>>) result, expected);654 655 expected.add(session.get(0) ); //a699 assertContains((List<List<ITask>>) result, expected); 700 701 expected.add(session.get(0).getTask()); //a 656 702 // aca 657 assertContains((List<List<ITask Instance>>) result, expected);658 659 expected.clear(); 660 expected.add(session.get(4) ); //c661 expected.add(session.get(0) ); //a703 assertContains((List<List<ITask>>) result, expected); 704 705 expected.clear(); 706 expected.add(session.get(4).getTask()); //c 707 expected.add(session.get(0).getTask()); //a 662 708 // ca 663 assertContains((List<List<ITask Instance>>) result, expected);664 665 expected.add(session.get(6) ); //d709 assertContains((List<List<ITask>>) result, expected); 710 711 expected.add(session.get(6).getTask()); //d 666 712 // cad 667 assertContains((List<List<ITask Instance>>) result, expected);668 669 expected.clear(); 670 expected.add(session.get(0) ); //a671 expected.add(session.get(6) ); //d713 assertContains((List<List<ITask>>) result, expected); 714 715 expected.clear(); 716 expected.add(session.get(0).getTask()); //a 717 expected.add(session.get(6).getTask()); //d 672 718 // ad 673 assertContains((List<List<ITask Instance>>) result, expected);674 675 expected.add(session.get(0) ); //a719 assertContains((List<List<ITask>>) result, expected); 720 721 expected.add(session.get(0).getTask()); //a 676 722 // ada 677 assertContains((List<List<ITask Instance>>) result, expected);678 679 expected.clear(); 680 expected.add(session.get(6) ); //d681 expected.add(session.get(0) ); //a723 assertContains((List<List<ITask>>) result, expected); 724 725 expected.clear(); 726 expected.add(session.get(6).getTask()); //d 727 expected.add(session.get(0).getTask()); //a 682 728 // da 683 assertContains((List<List<ITask Instance>>) result, expected);684 685 expected.add(session.get(1) ); //b729 assertContains((List<List<ITask>>) result, expected); 730 731 expected.add(session.get(1).getTask()); //b 686 732 // dab 687 assertContains((List<List<ITask Instance>>) result, expected);733 assertContains((List<List<ITask>>) result, expected); 688 734 } 689 735 … … 695 741 696 742 // get all sequences with a minimal length of two that occur exactly twice 697 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(2, 2);743 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(2, 2); 698 744 699 745 assertEquals(5, result.size()); 700 746 701 List<ITask Instance> expected = new ArrayList<ITaskInstance>();702 expected.add(session.get(0) ); //a703 expected.add(session.get(1) ); //b747 List<ITask> expected = new ArrayList<ITask>(); 748 expected.add(session.get(0).getTask()); //a 749 expected.add(session.get(1).getTask()); //b 704 750 // ab 705 assertContains((List<List<ITask Instance>>) result, expected);706 707 expected.add(session.get(2) ); //r751 assertContains((List<List<ITask>>) result, expected); 752 753 expected.add(session.get(2).getTask()); //r 708 754 // abr 709 assertContains((List<List<ITask Instance>>) result, expected);710 711 expected.clear(); 712 expected.add(session.get(1) ); //b713 expected.add(session.get(2) ); //r755 assertContains((List<List<ITask>>) result, expected); 756 757 expected.clear(); 758 expected.add(session.get(1).getTask()); //b 759 expected.add(session.get(2).getTask()); //r 714 760 // br 715 assertContains((List<List<ITask Instance>>) result, expected);716 717 expected.add(session.get(0) ); //a761 assertContains((List<List<ITask>>) result, expected); 762 763 expected.add(session.get(0).getTask()); //a 718 764 // bra 719 assertContains((List<List<ITask Instance>>) result, expected);720 721 expected.clear(); 722 expected.add(session.get(2) ); //r723 expected.add(session.get(0) ); //a765 assertContains((List<List<ITask>>) result, expected); 766 767 expected.clear(); 768 expected.add(session.get(2).getTask()); //r 769 expected.add(session.get(0).getTask()); //a 724 770 // ra 725 assertContains((List<List<ITask Instance>>) result, expected);771 assertContains((List<List<ITask>>) result, expected); 726 772 } 727 773 … … 733 779 734 780 // get all sequences with a minimal length of two that occur exactly three times 735 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(2, 3);781 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(2, 3); 736 782 737 783 assertEquals(0, result.size()); … … 745 791 746 792 // get all sequences with a minimal length of three that occur most often 747 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(3, 0);793 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(3, 0); 748 794 749 795 assertEquals(2, result.size()); 750 796 751 List<ITask Instance> expected = new ArrayList<ITaskInstance>();752 expected.add(session.get(0) ); //a753 expected.add(session.get(1) ); //b754 expected.add(session.get(2) ); //r755 assertContains((List<List<ITask Instance>>) result, expected);756 757 expected.clear(); 758 expected.add(session.get(1) ); //b759 expected.add(session.get(2) ); //r760 expected.add(session.get(0) ); //a761 assertContains((List<List<ITask Instance>>) result, expected);797 List<ITask> expected = new ArrayList<ITask>(); 798 expected.add(session.get(0).getTask()); //a 799 expected.add(session.get(1).getTask()); //b 800 expected.add(session.get(2).getTask()); //r 801 assertContains((List<List<ITask>>) result, expected); 802 803 expected.clear(); 804 expected.add(session.get(1).getTask()); //b 805 expected.add(session.get(2).getTask()); //r 806 expected.add(session.get(0).getTask()); //a 807 assertContains((List<List<ITask>>) result, expected); 762 808 } 763 809 … … 769 815 770 816 // get all sequences with a minimal length of three that occur exactly once 771 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(3, 1);817 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(3, 1); 772 818 773 819 assertEquals(5, result.size()); 774 820 775 List<ITask Instance> expected = new ArrayList<ITaskInstance>();776 expected.add(session.get(2) ); //r777 expected.add(session.get(0) ); //a778 expected.add(session.get(4) ); //c821 List<ITask> expected = new ArrayList<ITask>(); 822 expected.add(session.get(2).getTask()); //r 823 expected.add(session.get(0).getTask()); //a 824 expected.add(session.get(4).getTask()); //c 779 825 // rac 780 assertContains((List<List<ITask Instance>>) result, expected);781 782 expected.clear(); 783 expected.add(session.get(0) ); //a784 expected.add(session.get(4) ); //c785 expected.add(session.get(0) ); //a826 assertContains((List<List<ITask>>) result, expected); 827 828 expected.clear(); 829 expected.add(session.get(0).getTask()); //a 830 expected.add(session.get(4).getTask()); //c 831 expected.add(session.get(0).getTask()); //a 786 832 // aca 787 assertContains((List<List<ITask Instance>>) result, expected);788 789 expected.clear(); 790 expected.add(session.get(4) ); //c791 expected.add(session.get(0) ); //a792 expected.add(session.get(6) ); //d833 assertContains((List<List<ITask>>) result, expected); 834 835 expected.clear(); 836 expected.add(session.get(4).getTask()); //c 837 expected.add(session.get(0).getTask()); //a 838 expected.add(session.get(6).getTask()); //d 793 839 // cad 794 assertContains((List<List<ITask Instance>>) result, expected);795 796 expected.clear(); 797 expected.add(session.get(0) ); //a798 expected.add(session.get(6) ); //d799 expected.add(session.get(0) ); //a840 assertContains((List<List<ITask>>) result, expected); 841 842 expected.clear(); 843 expected.add(session.get(0).getTask()); //a 844 expected.add(session.get(6).getTask()); //d 845 expected.add(session.get(0).getTask()); //a 800 846 // ada 801 assertContains((List<List<ITask Instance>>) result, expected);802 803 expected.clear(); 804 expected.add(session.get(6) ); //d805 expected.add(session.get(0) ); //a806 expected.add(session.get(1) ); //b847 assertContains((List<List<ITask>>) result, expected); 848 849 expected.clear(); 850 expected.add(session.get(6).getTask()); //d 851 expected.add(session.get(0).getTask()); //a 852 expected.add(session.get(1).getTask()); //b 807 853 // dab 808 assertContains((List<List<ITask Instance>>) result, expected);854 assertContains((List<List<ITask>>) result, expected); 809 855 } 810 856 … … 816 862 817 863 // get all sequences with a minimal length of four that occur most often 818 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(4, 0);864 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(4, 0); 819 865 820 866 // none of these exist, as the tree is only trained with sequences of length 3 … … 829 875 830 876 // get all sequences with a minimal length of four that occur exactly once 831 Collection<List<ITask Instance>> result = fixture.getSequencesWithOccurrenceCount(4, 1);877 Collection<List<ITask>> result = fixture.getSequencesWithOccurrenceCount(4, 1); 832 878 833 879 // none of these exist, as the tree is only trained with sequences of length 3 … … 841 887 fixture.trainSessions(Arrays.asList(session), 3); 842 888 843 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();844 subSequence.add(session.get(0) ); //a889 List<ITask> subSequence = new ArrayList<ITask>(); 890 subSequence.add(session.get(0).getTask()); //a 845 891 846 892 int result = fixture.getCount(subSequence); … … 856 902 fixture.trainSessions(Arrays.asList(session), 3); 857 903 858 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();859 subSequence.add(session.get(0) ); //a860 subSequence.add(session.get(1) ); //b904 List<ITask> subSequence = new ArrayList<ITask>(); 905 subSequence.add(session.get(0).getTask()); //a 906 subSequence.add(session.get(1).getTask()); //b 861 907 862 908 int result = fixture.getCount(subSequence); … … 871 917 fixture.trainSessions(Arrays.asList(session), 3); 872 918 873 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();874 subSequence.add(taskFactory.createNew TaskInstance(taskFactory.createNewSequence()));919 List<ITask> subSequence = new ArrayList<ITask>(); 920 subSequence.add(taskFactory.createNewSequence()); 875 921 876 922 int result = fixture.getCount(subSequence); … … 885 931 fixture.trainSessions(Arrays.asList(session), 3); 886 932 887 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();888 889 int result = fixture.getCount(subSequence, session.get(0) ); //a933 List<ITask> subSequence = new ArrayList<ITask>(); 934 935 int result = fixture.getCount(subSequence, session.get(0).getTask()); //a 890 936 891 937 // as we did not train the last single action, we may expect the "a" action only 4 times … … 899 945 fixture.trainSessions(Arrays.asList(session), 3); 900 946 901 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();902 subSequence.add(session.get(0) ); //a903 subSequence.add(session.get(1) ); //b904 905 int result = fixture.getCount(subSequence, session.get(2) ); //r947 List<ITask> subSequence = new ArrayList<ITask>(); 948 subSequence.add(session.get(0).getTask()); //a 949 subSequence.add(session.get(1).getTask()); //b 950 951 int result = fixture.getCount(subSequence, session.get(2).getTask()); //r 906 952 907 953 assertEquals(2, result); … … 914 960 fixture.trainSessions(Arrays.asList(session), 3); 915 961 916 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();962 List<ITask> subSequence = new ArrayList<ITask>(); 917 963 918 964 int result = fixture.getCount 919 (subSequence, taskFactory.createNew TaskInstance(taskFactory.createNewSequence()));965 (subSequence, taskFactory.createNewSequence()); 920 966 921 967 assertEquals(0, result); … … 928 974 fixture.trainSessions(Arrays.asList(session), 3); 929 975 930 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();931 subSequence.add(session.get(0) ); //a932 Collection<ITask Instance> expected = new ArrayList<ITaskInstance>();933 expected.add(session.get(1) ); //b934 expected.add(session.get(4) ); //c935 expected.add(session.get(6) ); //d936 937 Collection<ITask Instance> result = fixture.getFollowingSymbols(subSequence);976 List<ITask> subSequence = new ArrayList<ITask>(); 977 subSequence.add(session.get(0).getTask()); //a 978 Collection<ITask> expected = new ArrayList<ITask>(); 979 expected.add(session.get(1).getTask()); //b 980 expected.add(session.get(4).getTask()); //c 981 expected.add(session.get(6).getTask()); //d 982 983 Collection<ITask> result = fixture.getFollowingSymbols(subSequence); 938 984 939 985 assertCollectionContent(expected, result); … … 946 992 fixture.trainSessions(Arrays.asList(session), 3); 947 993 948 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();949 subSequence.add(session.get(0) ); //a950 subSequence.add(session.get(1) ); //b951 subSequence.add(session.get(2) ); //r952 953 Collection<ITask Instance> result = fixture.getFollowingSymbols(subSequence);994 List<ITask> subSequence = new ArrayList<ITask>(); 995 subSequence.add(session.get(0).getTask()); //a 996 subSequence.add(session.get(1).getTask()); //b 997 subSequence.add(session.get(2).getTask()); //r 998 999 Collection<ITask> result = fixture.getFollowingSymbols(subSequence); 954 1000 955 1001 assertEquals(0, result.size()); … … 962 1008 fixture.trainSessions(Arrays.asList(session), 3); 963 1009 964 List<ITask Instance> subSequence = new ArrayList<ITaskInstance>();965 subSequence.add(taskFactory.createNew TaskInstance(taskFactory.createNewSequence()));966 967 Collection<ITask Instance> result = fixture.getFollowingSymbols(subSequence);1010 List<ITask> subSequence = new ArrayList<ITask>(); 1011 subSequence.add(taskFactory.createNewSequence()); 1012 1013 Collection<ITask> result = fixture.getFollowingSymbols(subSequence); 968 1014 969 1015 assertEquals(0, result.size()); … … 1010 1056 int order = 2; 1011 1057 1012 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 50, order);1058 TaskTrieTester tester = new TaskTrieTester(3, 50, order); 1013 1059 1014 1060 long start = System.currentTimeMillis(); … … 1030 1076 int order = 2; 1031 1077 1032 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 10000, order);1078 TaskTrieTester tester = new TaskTrieTester(3, 10000, order); 1033 1079 1034 1080 long start = System.currentTimeMillis(); … … 1050 1096 int order = 2; 1051 1097 1052 Task InstanceTrieTester tester = new TaskInstanceTrieTester(30, 10000, order);1098 TaskTrieTester tester = new TaskTrieTester(30, 10000, order); 1053 1099 1054 1100 long start = System.currentTimeMillis(); … … 1070 1116 int order = 2; 1071 1117 1072 Task InstanceTrieTester tester = new TaskInstanceTrieTester(300, 10000, order);1118 TaskTrieTester tester = new TaskTrieTester(300, 10000, order); 1073 1119 1074 1120 long start = System.currentTimeMillis(); … … 1090 1136 int order = 2; 1091 1137 1092 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 10000, order);1138 TaskTrieTester tester = new TaskTrieTester(1000, 10000, order); 1093 1139 1094 1140 long start = System.currentTimeMillis(); … … 1110 1156 int order = 3; 1111 1157 1112 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 50, order);1158 TaskTrieTester tester = new TaskTrieTester(3, 50, order); 1113 1159 1114 1160 long start = System.currentTimeMillis(); … … 1130 1176 int order = 3; 1131 1177 1132 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 10000, order);1178 TaskTrieTester tester = new TaskTrieTester(3, 10000, order); 1133 1179 1134 1180 long start = System.currentTimeMillis(); … … 1150 1196 int order = 3; 1151 1197 1152 Task InstanceTrieTester tester = new TaskInstanceTrieTester(30, 10000, order);1198 TaskTrieTester tester = new TaskTrieTester(30, 10000, order); 1153 1199 1154 1200 long start = System.currentTimeMillis(); … … 1170 1216 int order = 3; 1171 1217 1172 Task InstanceTrieTester tester = new TaskInstanceTrieTester(300, 10000, order);1218 TaskTrieTester tester = new TaskTrieTester(300, 10000, order); 1173 1219 1174 1220 long start = System.currentTimeMillis(); … … 1190 1236 int order = 3; 1191 1237 1192 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 10000, order);1238 TaskTrieTester tester = new TaskTrieTester(1000, 10000, order); 1193 1239 1194 1240 long start = System.currentTimeMillis(); … … 1210 1256 int order = 4; 1211 1257 1212 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 50, order);1258 TaskTrieTester tester = new TaskTrieTester(3, 50, order); 1213 1259 1214 1260 long start = System.currentTimeMillis(); … … 1230 1276 int order = 4; 1231 1277 1232 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 10000, order);1278 TaskTrieTester tester = new TaskTrieTester(3, 10000, order); 1233 1279 1234 1280 long start = System.currentTimeMillis(); … … 1250 1296 int order = 4; 1251 1297 1252 Task InstanceTrieTester tester = new TaskInstanceTrieTester(30, 10000, order);1298 TaskTrieTester tester = new TaskTrieTester(30, 10000, order); 1253 1299 1254 1300 long start = System.currentTimeMillis(); … … 1270 1316 int order = 4; 1271 1317 1272 Task InstanceTrieTester tester = new TaskInstanceTrieTester(300, 10000, order);1318 TaskTrieTester tester = new TaskTrieTester(300, 10000, order); 1273 1319 1274 1320 long start = System.currentTimeMillis(); … … 1290 1336 int order = 4; 1291 1337 1292 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 10000, order);1338 TaskTrieTester tester = new TaskTrieTester(1000, 10000, order); 1293 1339 1294 1340 long start = System.currentTimeMillis(); … … 1310 1356 int order = 5; 1311 1357 1312 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 50, order);1358 TaskTrieTester tester = new TaskTrieTester(3, 50, order); 1313 1359 1314 1360 long start = System.currentTimeMillis(); … … 1330 1376 int order = 5; 1331 1377 1332 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 10000, order);1378 TaskTrieTester tester = new TaskTrieTester(3, 10000, order); 1333 1379 1334 1380 long start = System.currentTimeMillis(); … … 1350 1396 int order = 5; 1351 1397 1352 Task InstanceTrieTester tester = new TaskInstanceTrieTester(30, 10000, order);1398 TaskTrieTester tester = new TaskTrieTester(30, 10000, order); 1353 1399 1354 1400 long start = System.currentTimeMillis(); … … 1370 1416 int order = 5; 1371 1417 1372 Task InstanceTrieTester tester = new TaskInstanceTrieTester(300, 10000, order);1418 TaskTrieTester tester = new TaskTrieTester(300, 10000, order); 1373 1419 1374 1420 long start = System.currentTimeMillis(); … … 1390 1436 int order = 5; 1391 1437 1392 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 10000, order);1438 TaskTrieTester tester = new TaskTrieTester(1000, 10000, order); 1393 1439 1394 1440 long start = System.currentTimeMillis(); … … 1410 1456 int order = 6; 1411 1457 1412 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 50, order);1458 TaskTrieTester tester = new TaskTrieTester(3, 50, order); 1413 1459 1414 1460 long start = System.currentTimeMillis(); … … 1430 1476 int order = 6; 1431 1477 1432 Task InstanceTrieTester tester = new TaskInstanceTrieTester(3, 10000, order);1478 TaskTrieTester tester = new TaskTrieTester(3, 10000, order); 1433 1479 1434 1480 long start = System.currentTimeMillis(); … … 1450 1496 int order = 6; 1451 1497 1452 Task InstanceTrieTester tester = new TaskInstanceTrieTester(30, 10000, order);1498 TaskTrieTester tester = new TaskTrieTester(30, 10000, order); 1453 1499 1454 1500 long start = System.currentTimeMillis(); … … 1470 1516 int order = 6; 1471 1517 1472 Task InstanceTrieTester tester = new TaskInstanceTrieTester(300, 10000, order);1518 TaskTrieTester tester = new TaskTrieTester(300, 10000, order); 1473 1519 1474 1520 long start = System.currentTimeMillis(); … … 1490 1536 int order = 6; 1491 1537 1492 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 10000, order);1538 TaskTrieTester tester = new TaskTrieTester(1000, 10000, order); 1493 1539 1494 1540 long start = System.currentTimeMillis(); … … 1510 1556 int order = 3; 1511 1557 1512 Task InstanceTrieTester tester = new TaskInstanceTrieTester(1000, 100000, order);1558 TaskTrieTester tester = new TaskTrieTester(1000, 100000, order); 1513 1559 1514 1560 long start = System.currentTimeMillis(); … … 1527 1573 * 1528 1574 */ 1529 private void assertContains(List<List<ITask Instance>> listOfList,1530 List<ITask Instance> containedList)1575 private void assertContains(List<List<ITask>> listOfList, 1576 List<ITask> containedList) 1531 1577 { 1532 1578 boolean found = false; 1533 for (List<ITask Instance> candidate : listOfList) {1579 for (List<ITask> candidate : listOfList) { 1534 1580 if (candidate.size() == containedList.size()) { 1535 1581 found = true; … … 1561 1607 * @author Patrick Harms 1562 1608 */ 1563 private class Task InstanceTrieTester implements TrieProcessor<ITaskInstance> {1609 private class TaskTrieTester implements TrieProcessor<ITask> { 1564 1610 1565 1611 /** 1566 1612 * the symbols used for testing the trie 1567 1613 */ 1568 private Map<Integer, ITask Instance> symbols = new HashMap<Integer, ITaskInstance>();1614 private Map<Integer, ITask> symbols = new HashMap<Integer, ITask>(); 1569 1615 1570 1616 /** … … 1596 1642 * trie calculated the count correctly and if it did not create too many nodes. 1597 1643 */ 1598 public Task InstanceTrieTester(int noOfSymbols, int sequenceLength, int maxOrder) {1644 public TaskTrieTester(int noOfSymbols, int sequenceLength, int maxOrder) { 1599 1645 if (noOfSymbols > 1024) { 1600 1646 throw new IllegalArgumentException("too large number of symbols"); … … 1616 1662 1617 1663 for (int i = 0; i < dummySession.size(); i++) { 1618 this.symbols.put(i, dummySession.get(i) );1664 this.symbols.put(i, dummySession.get(i).getTask()); 1619 1665 } 1620 1666 … … 1675 1721 */ 1676 1722 @Override 1677 public TrieProcessor.Result process(List<ITask Instance> sequence, int count) {1723 public TrieProcessor.Result process(List<ITask> sequence, int count) { 1678 1724 long key = 0; 1679 1725 1680 for (ITask Instancesymbol : sequence) {1726 for (ITask symbol : sequence) { 1681 1727 int symbolIndex = -1; 1682 1728 1683 for (Map.Entry<Integer, ITask Instance> entry : symbols.entrySet()) {1729 for (Map.Entry<Integer, ITask> entry : symbols.entrySet()) { 1684 1730 if (strategy.getTaskComparator().equals(entry.getValue(), symbol)) { 1685 1731 symbolIndex = entry.getKey();
Note: See TracChangeset
for help on using the changeset viewer.