diff --git a/.idea/artifacts/killer_sokoban_jar.xml b/.idea/artifacts/killer_sokoban_jar.xml new file mode 100644 index 0000000000000000000000000000000000000000..33d5e2ff873f136215c357d7c5db8b5675fde6b9 --- /dev/null +++ b/.idea/artifacts/killer_sokoban_jar.xml @@ -0,0 +1,8 @@ +<component name="ArtifactManager"> + <artifact type="jar" name="killer_sokoban:jar"> + <output-path>$PROJECT_DIR$/out/artifacts/killer_sokoban_jar</output-path> + <root id="archive" name="killer_sokoban.jar"> + <element id="module-output" name="killer_sokoban" /> + </root> + </artifact> +</component> \ No newline at end of file diff --git a/jars/GIMPimages/Crate.png b/jars/GIMPimages/Crate.png new file mode 100644 index 0000000000000000000000000000000000000000..6306c008464c0bb6fe5ea0038eae2b685f24cb09 Binary files /dev/null and b/jars/GIMPimages/Crate.png differ diff --git a/jars/GIMPimages/Hole.png b/jars/GIMPimages/Hole.png new file mode 100644 index 0000000000000000000000000000000000000000..70e28d9c038f232ad318b8742e5050dc88537c67 Binary files /dev/null and b/jars/GIMPimages/Hole.png differ diff --git a/jars/GIMPimages/Honey.png b/jars/GIMPimages/Honey.png new file mode 100644 index 0000000000000000000000000000000000000000..5a54aa1867d29364f4f4adc8e0ac9f2812d21be9 Binary files /dev/null and b/jars/GIMPimages/Honey.png differ diff --git a/jars/GIMPimages/Oil.png b/jars/GIMPimages/Oil.png new file mode 100644 index 0000000000000000000000000000000000000000..1f527dfb506f23eddce5bb899f479c2cd200190c Binary files /dev/null and b/jars/GIMPimages/Oil.png differ diff --git a/jars/GIMPimages/SimpleField.png b/jars/GIMPimages/SimpleField.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6d365c7632c0f6730194d023e645bd49745d05 Binary files /dev/null and b/jars/GIMPimages/SimpleField.png differ diff --git a/jars/GIMPimages/SwitchField.png b/jars/GIMPimages/SwitchField.png new file mode 100644 index 0000000000000000000000000000000000000000..609eec77ec06888b173c220f778e8a8f4c195a66 Binary files /dev/null and b/jars/GIMPimages/SwitchField.png differ diff --git a/jars/GIMPimages/TargetField.png b/jars/GIMPimages/TargetField.png new file mode 100644 index 0000000000000000000000000000000000000000..8ae24d50d8436f40eab941c0d287f2fe3130d92d Binary files /dev/null and b/jars/GIMPimages/TargetField.png differ diff --git a/jars/GIMPimages/Wall.png b/jars/GIMPimages/Wall.png new file mode 100644 index 0000000000000000000000000000000000000000..a095952fcf54bcbc6da27e9471984edbf2c16908 Binary files /dev/null and b/jars/GIMPimages/Wall.png differ diff --git a/jars/GIMPimages/w1.png b/jars/GIMPimages/w1.png new file mode 100644 index 0000000000000000000000000000000000000000..a254470a7ca65a7805f8a583f900891ec1bf93dc Binary files /dev/null and b/jars/GIMPimages/w1.png differ diff --git a/jars/GIMPimages/w2.png b/jars/GIMPimages/w2.png new file mode 100644 index 0000000000000000000000000000000000000000..a18d7e4cebf9d6c74662e628de8fc2284be64fe9 Binary files /dev/null and b/jars/GIMPimages/w2.png differ diff --git a/jars/killer_sokoban_action.jar b/jars/killer_sokoban_action.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cdb80090e69640163f8c0771f6a28d8fbec9934 Binary files /dev/null and b/jars/killer_sokoban_action.jar differ diff --git a/jars/killer_sokoban_turn-based.jar b/jars/killer_sokoban_turn-based.jar new file mode 100644 index 0000000000000000000000000000000000000000..5ce57ef0ef227c00051d4c9a97b512de689afbbd Binary files /dev/null and b/jars/killer_sokoban_turn-based.jar differ diff --git a/jars/testmap1.in b/jars/testmap1.in new file mode 100644 index 0000000000000000000000000000000000000000..4898d7bf69ce89828828d7bd5e0ce545790eac3f --- /dev/null +++ b/jars/testmap1.in @@ -0,0 +1,35 @@ +parsemap 16 20 +wwwwwwwwwwwwwwwwwwww +wtmmmmmmmmmmmmmmmmmw +wsmmmmmtmmmmmmmmmtmw +wmmmmmmmmmmhmmmmmmmw +wmhmwwwwmmmmmmmkmmmw +wmmmwtmmmmmwmmmmmmmw +wmmmwmmmmmmmsmmmmmmw +wmmmwkmmmttmmmmmmmmw +wmmmmmmmmttmmmkwmmmw +wmmmmmmsmmmmmmmwmmmw +wmmmmmmmwmmmmmtwmmmw +wmmmkmmmmmmmwwwwmhmw +wmmmmmmmhmmmmmmmmmmw +wmtmmmmmmmmmtmmmmmsw +wmmmmmmmmmmmmmmmmmtw +wwwwwwwwwwwwwwwwwwww +worker w1 3 f_2_2 +worker w2 3 f_13_17 +crate c1 f_2_15 +crate c2 f_2_16 +crate c3 f_3_15 +crate c4 f_3_16 +crate c5 f_5_2 +crate c6 f_7_14 +crate c7 f_8_5 +crate c8 f_10_17 +crate c9 f_12_3 +crate c10 f_12_4 +crate c11 f_13_3 +crate c12 f_13_4 +setswitch f_6_12 f_4_15 +setswitch f_13_18 f_7_5 +setswitch f_2_1 f_8_14 +setswitch f_9_7 f_11_4 diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..8e136230bae24a767a965df5d23a974b380a4054 --- /dev/null +++ b/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: killer_sokoban.Main + diff --git a/Teszteset1.in b/testcases/Teszteset1.in similarity index 88% rename from Teszteset1.in rename to testcases/Teszteset1.in index 05ece42d0c25917bbb86298de8fae3b39e4b3cb6..787372e89dfaa67d970a8569584598f3e8290397 100644 --- a/Teszteset1.in +++ b/testcases/Teszteset1.in @@ -1,9 +1,9 @@ -parsemap 4 5 -wwwww -wmthw -wkmsw -wwwww - -setswitch f_2_3 f_2_1 - -stat f_2_1 +parsemap 4 5 +wwwww +wmthw +wkmsw +wwwww + +setswitch f_2_3 f_2_1 + +stat f_2_1 diff --git a/Teszteset1.out b/testcases/Teszteset1.out similarity index 95% rename from Teszteset1.out rename to testcases/Teszteset1.out index a2abca89d09d2d11bc598f7b5c5a9551ce275205..f423715fde30509255a00aa289321f6d9c0aa44a 100644 --- a/Teszteset1.out +++ b/testcases/Teszteset1.out @@ -1,7 +1,7 @@ -neighborUp: f_1_1 -neighborRight: f_2_2 -neighborDown: f_3_1 -neighborLeft: f_2_0 -moveable: null -fluid: no fluid +neighborUp: f_1_1 +neighborRight: f_2_2 +neighborDown: f_3_1 +neighborLeft: f_2_0 +moveable: null +fluid: no fluid sHole: f_2_3 \ No newline at end of file diff --git a/Teszteset10.in b/testcases/Teszteset10.in similarity index 90% rename from Teszteset10.in rename to testcases/Teszteset10.in index 05f8cf8c29d27917688593b960d22f4cb91889fe..64b489b992a89629c96c811d0aa6cb26997c741a 100644 --- a/Teszteset10.in +++ b/testcases/Teszteset10.in @@ -1,14 +1,14 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_2 -crate c1 f_1_3 - -step w1 right - -stat f_1_3 -stat f_1_4 - +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_2 +crate c1 f_1_3 + +step w1 right + +stat f_1_3 +stat f_1_4 + stat w1 \ No newline at end of file diff --git a/Teszteset10.out b/testcases/Teszteset10.out similarity index 94% rename from Teszteset10.out rename to testcases/Teszteset10.out index fb4ced04c6cfd8d416e50f4c6560855b6337ab2b..5a2845aa9ef560e708b562dbca7903fab43554fd 100644 --- a/Teszteset10.out +++ b/testcases/Teszteset10.out @@ -1,16 +1,16 @@ -neighborUp: f_0_3 -neighborRight: f_1_4 -neighborDown: f_2_3 -neighborLeft: f_1_2 -moveable: w1 -fluid: no fluid -neighborUp: f_0_4 -neighborRight: f_1_5 -neighborDown: f_2_4 -neighborLeft: f_1_3 -moveable: c1 -fluid: no fluid -myField: f_1_3 -points: 0 -force: 5.0 +neighborUp: f_0_3 +neighborRight: f_1_4 +neighborDown: f_2_3 +neighborLeft: f_1_2 +moveable: w1 +fluid: no fluid +neighborUp: f_0_4 +neighborRight: f_1_5 +neighborDown: f_2_4 +neighborLeft: f_1_3 +moveable: c1 +fluid: no fluid +myField: f_1_3 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset11.in b/testcases/Teszteset11.in similarity index 89% rename from Teszteset11.in rename to testcases/Teszteset11.in index 9817ed9df0f8356aaba027471101e7c9a02f5e42..467f2d6a9e79c27bef7b66a0d70813e69d903f44 100644 --- a/Teszteset11.in +++ b/testcases/Teszteset11.in @@ -1,14 +1,14 @@ -parsemap 4 6 -wwwwww -wmmtmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -crate c1 f_1_2 - -stat c1 - -step w1 right - -stat w1 +parsemap 4 6 +wwwwww +wmmtmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +crate c1 f_1_2 + +stat c1 + +step w1 right + +stat w1 stat c1 \ No newline at end of file diff --git a/Teszteset11.out b/testcases/Teszteset11.out similarity index 94% rename from Teszteset11.out rename to testcases/Teszteset11.out index b7a7d0cbdd0ccc5351ce792cf772c22bb1a81665..7102b28dd1c7935e4c5a6db6e42bc7d88237ecbe 100644 --- a/Teszteset11.out +++ b/testcases/Teszteset11.out @@ -1,10 +1,10 @@ -myField: f_1_2 -couldMove: true -isOnTarget: false -myField: f_1_2 -points: 1 -force: 5.0 -alive: true -myField: f_1_3 -couldMove: true +myField: f_1_2 +couldMove: true +isOnTarget: false +myField: f_1_2 +points: 1 +force: 5.0 +alive: true +myField: f_1_3 +couldMove: true isOnTarget: true \ No newline at end of file diff --git a/Teszteset12.in b/testcases/Teszteset12.in similarity index 91% rename from Teszteset12.in rename to testcases/Teszteset12.in index c6276a0f4715222940b24be85587a8fac955fcdf..e21df437a263d8f01676a30ebd1c4f8dcc5ffa52 100644 --- a/Teszteset12.in +++ b/testcases/Teszteset12.in @@ -1,14 +1,14 @@ -parsemap 4 6 -wwwwww -wmmkmw -wmmsmw -wwwwww -worker w1 5 f_1_1 -crate c1 f_1_2 -setswitch f_2_3 f_1_3 - -stat f_2_3 - -step w1 right - +parsemap 4 6 +wwwwww +wmmkmw +wmmsmw +wwwwww +worker w1 5 f_1_1 +crate c1 f_1_2 +setswitch f_2_3 f_1_3 + +stat f_2_3 + +step w1 right + stat f_2_3 \ No newline at end of file diff --git a/Teszteset12.out b/testcases/Teszteset12.out similarity index 94% rename from Teszteset12.out rename to testcases/Teszteset12.out index a7c3120f4a9a1745a408e5850acd2776d9ddc5d6..de3dea782433e001100512798c9492c7da715b23 100644 --- a/Teszteset12.out +++ b/testcases/Teszteset12.out @@ -1,14 +1,14 @@ -neighborUp: f_1_3 -neighborRight: f_2_4 -neighborDown: f_3_3 -neighborLeft: f_2_2 -moveable: null -fluid: no fluid -opened: false -neighborUp: f_1_3 -neighborRight: f_2_4 -neighborDown: f_3_3 -neighborLeft: f_2_2 -moveable: null -fluid: no fluid +neighborUp: f_1_3 +neighborRight: f_2_4 +neighborDown: f_3_3 +neighborLeft: f_2_2 +moveable: null +fluid: no fluid +opened: false +neighborUp: f_1_3 +neighborRight: f_2_4 +neighborDown: f_3_3 +neighborLeft: f_2_2 +moveable: null +fluid: no fluid opened: true \ No newline at end of file diff --git a/Teszteset13.in b/testcases/Teszteset13.in similarity index 90% rename from Teszteset13.in rename to testcases/Teszteset13.in index 37430e2cebf9508fa8b7aa74db8433efc7958c92..71530b1b5faeeb100925d63d35299bf4b091128e 100644 --- a/Teszteset13.in +++ b/testcases/Teszteset13.in @@ -1,11 +1,11 @@ -parsemap 4 6 -wwwwww -wmmhmw -wmmmmw -wwwwww -worker w1 5 f_1_2 -crate c1 f_1_3 - -step w1 right - +parsemap 4 6 +wwwwww +wmmhmw +wmmmmw +wwwwww +worker w1 5 f_1_2 +crate c1 f_1_3 + +step w1 right + stat c1 \ No newline at end of file diff --git a/Teszteset13.out b/testcases/Teszteset13.out similarity index 100% rename from Teszteset13.out rename to testcases/Teszteset13.out diff --git a/Teszteset14.in b/testcases/Teszteset14.in similarity index 91% rename from Teszteset14.in rename to testcases/Teszteset14.in index e9b5af03a8cfdd50b6f52bd319bcd49d91f7b223..175f606ec0270138faa386b61f4bd377062f3ddf 100644 --- a/Teszteset14.in +++ b/testcases/Teszteset14.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmmsmw -wmmkmw -wwwwww -worker w1 5 f_1_1 -crate c1 f_1_2 -setswitch f_1_3 f_2_3 -crate c2 f_2_3 - -step w1 right - +parsemap 4 6 +wwwwww +wmmsmw +wmmkmw +wwwwww +worker w1 5 f_1_1 +crate c1 f_1_2 +setswitch f_1_3 f_2_3 +crate c2 f_2_3 + +step w1 right + stat c1 \ No newline at end of file diff --git a/Teszteset14.out b/testcases/Teszteset14.out similarity index 100% rename from Teszteset14.out rename to testcases/Teszteset14.out diff --git a/Teszteset15.in b/testcases/Teszteset15.in similarity index 91% rename from Teszteset15.in rename to testcases/Teszteset15.in index bddc115a0986b0fd3718aec0e70351be9a499ff2..95ed09696ceb499d9d3f688f79cd364effb07ac8 100644 --- a/Teszteset15.in +++ b/testcases/Teszteset15.in @@ -1,12 +1,12 @@ -parsemap 4 6 -wwwwww -wmmsmw -wmmkmw -wwwwww -worker w1 5 f_1_2 -crate c1 f_1_3 -setswitch f_1_3 f_2_3 - -step w1 right - +parsemap 4 6 +wwwwww +wmmsmw +wmmkmw +wwwwww +worker w1 5 f_1_2 +crate c1 f_1_3 +setswitch f_1_3 f_2_3 + +step w1 right + stat c1 \ No newline at end of file diff --git a/Teszteset15.out b/testcases/Teszteset15.out similarity index 96% rename from Teszteset15.out rename to testcases/Teszteset15.out index f9d96406b4f455455b7d059987e1b1c377e89af1..8c2eee6a0655d5e7ce0ff5ca75a4b0c68621a085 100644 --- a/Teszteset15.out +++ b/testcases/Teszteset15.out @@ -1,3 +1,3 @@ -myField: f_1_4 -couldMove: true +myField: f_1_4 +couldMove: true isOnTarget: false \ No newline at end of file diff --git a/Teszteset16.in b/testcases/Teszteset16.in similarity index 92% rename from Teszteset16.in rename to testcases/Teszteset16.in index 3c434d177307e582bbc579adf8b40762d24c2c93..e0087349183d483a051418c521e546311725f9ee 100644 --- a/Teszteset16.in +++ b/testcases/Teszteset16.in @@ -1,9 +1,9 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -worker w2 5 f_1_2 -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +worker w2 5 f_1_2 +step w1 right stat w2 \ No newline at end of file diff --git a/Teszteset16.out b/testcases/Teszteset16.out similarity index 94% rename from Teszteset16.out rename to testcases/Teszteset16.out index a2d1778376795883e9cfadae0bdc4cfc298bbefc..cbe120c9a443b8f16ce706b662521b68cd9c8803 100644 --- a/Teszteset16.out +++ b/testcases/Teszteset16.out @@ -1,4 +1,4 @@ -myField: f_1_3 -points: 0 -force: 5.0 +myField: f_1_3 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset17.in b/testcases/Teszteset17.in similarity index 92% rename from Teszteset17.in rename to testcases/Teszteset17.in index 274ae0e401ebffd88c44efe45d7f7cd94524e606..9ef949c920b6a34f4b149eac4e20a558820f3432 100644 --- a/Teszteset17.in +++ b/testcases/Teszteset17.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -crate c f_1_2 -worker w2 5 f_1_3 -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +crate c f_1_2 +worker w2 5 f_1_3 +step w1 right stat w2 \ No newline at end of file diff --git a/Teszteset17.out b/testcases/Teszteset17.out similarity index 94% rename from Teszteset17.out rename to testcases/Teszteset17.out index 0206be6e61df6f53c9c30515a1db8aa8c64a96a0..adb082d3a061142bfc1f2324d49324578b4922aa 100644 --- a/Teszteset17.out +++ b/testcases/Teszteset17.out @@ -1,4 +1,4 @@ -myField: f_1_4 -points: 0 -force: 5.0 +myField: f_1_4 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset18.in b/testcases/Teszteset18.in similarity index 92% rename from Teszteset18.in rename to testcases/Teszteset18.in index a236de3fcddb5c7f01fdea6bda3d81b273dce8bf..0f89f92ec5574452c1c3772f4d4ae95762bad495 100644 --- a/Teszteset18.in +++ b/testcases/Teszteset18.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +step w1 right stat c2 \ No newline at end of file diff --git a/Teszteset18.out b/testcases/Teszteset18.out similarity index 96% rename from Teszteset18.out rename to testcases/Teszteset18.out index f9d96406b4f455455b7d059987e1b1c377e89af1..8c2eee6a0655d5e7ce0ff5ca75a4b0c68621a085 100644 --- a/Teszteset18.out +++ b/testcases/Teszteset18.out @@ -1,3 +1,3 @@ -myField: f_1_4 -couldMove: true +myField: f_1_4 +couldMove: true isOnTarget: false \ No newline at end of file diff --git a/Teszteset19.in b/testcases/Teszteset19.in similarity index 91% rename from Teszteset19.in rename to testcases/Teszteset19.in index 3da5d3ddcc79ee20796653041953aeea082924a6..e51c8c204d835ceb41f8c6d79822bef7bc3838ff 100644 --- a/Teszteset19.in +++ b/testcases/Teszteset19.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmtmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -crate c1 f_1_2 -step w1 right -stat c1 +parsemap 4 6 +wwwwww +wmtmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +crate c1 f_1_2 +step w1 right +stat c1 stat w1 \ No newline at end of file diff --git a/Teszteset19.out b/testcases/Teszteset19.out similarity index 94% rename from Teszteset19.out rename to testcases/Teszteset19.out index 495d305d1a0db1d66143bd50eca430c7a07e764e..253110c22098faf8689ec24bfb32d463eefb36b9 100644 --- a/Teszteset19.out +++ b/testcases/Teszteset19.out @@ -1,7 +1,7 @@ -myField: f_1_3 -couldMove: true -isOnTarget: false -myField: f_1_2 -points: -1 -force: 5.0 +myField: f_1_3 +couldMove: true +isOnTarget: false +myField: f_1_2 +points: -1 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset2.in b/testcases/Teszteset2.in similarity index 90% rename from Teszteset2.in rename to testcases/Teszteset2.in index 0a452f3fc821f0e06b96008eef865ed07dceee63..232e7380c1d0029ee181a5bbbb4418bc42e2be47 100644 --- a/Teszteset2.in +++ b/testcases/Teszteset2.in @@ -1,11 +1,11 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww - -worker w1 5 f_1_1 -step w1 left - -stat f_1_1 +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww + +worker w1 5 f_1_1 +step w1 left + +stat f_1_1 stat w1 \ No newline at end of file diff --git a/Teszteset2.out b/testcases/Teszteset2.out similarity index 94% rename from Teszteset2.out rename to testcases/Teszteset2.out index c5d6c89eeb44d485df8517808d24ef52dcd41dc1..bf840234611b71b7b6d3d0282b755887108edc2c 100644 --- a/Teszteset2.out +++ b/testcases/Teszteset2.out @@ -1,10 +1,10 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: w1 -fluid: no fluid -myField: f_1_1 -points: 0 -force: 5.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: w1 +fluid: no fluid +myField: f_1_1 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset20.in b/testcases/Teszteset20.in similarity index 93% rename from Teszteset20.in rename to testcases/Teszteset20.in index 098786abe4468c87c89f6804aae286a40e4752e8..d83b3a03f36009e967f6070577d01eb301114f97 100644 --- a/Teszteset20.in +++ b/testcases/Teszteset20.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmkmmw -wmsmmw -wwwwww -setswitch f_2_2 f_1_2 -worker w1 5 f_1_1 -crate c1 f_1_2 -step w1 right +parsemap 4 6 +wwwwww +wmkmmw +wmsmmw +wwwwww +setswitch f_2_2 f_1_2 +worker w1 5 f_1_1 +crate c1 f_1_2 +step w1 right stat f_2_2 \ No newline at end of file diff --git a/Teszteset20.out b/testcases/Teszteset20.out similarity index 95% rename from Teszteset20.out rename to testcases/Teszteset20.out index 2965be0e9df3dba20127148d6a28d8266dd54a85..0d246bc96247d2b77ef5337356f581dbaffd2473 100644 --- a/Teszteset20.out +++ b/testcases/Teszteset20.out @@ -1,7 +1,7 @@ -neighborUp: f_1_2 -neighborRight: f_2_3 -neighborDown: f_3_2 -neighborLeft: f_2_1 -moveable: null -fluid: no fluid +neighborUp: f_1_2 +neighborRight: f_2_3 +neighborDown: f_3_2 +neighborLeft: f_2_1 +moveable: null +fluid: no fluid opened: false \ No newline at end of file diff --git a/Teszteset21.in b/testcases/Teszteset21.in similarity index 92% rename from Teszteset21.in rename to testcases/Teszteset21.in index 54d8ecf7632434b364c4725910bee3c290097ebc..dc6a14a747a8f080054b8ab8948e2667020d6309 100644 --- a/Teszteset21.in +++ b/testcases/Teszteset21.in @@ -1,9 +1,9 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -worker w2 5 f_1_2 -step w2 left +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +worker w2 5 f_1_2 +step w2 left stat w1 \ No newline at end of file diff --git a/Teszteset21.out b/testcases/Teszteset21.out similarity index 94% rename from Teszteset21.out rename to testcases/Teszteset21.out index ba92605c6e4875e3338858e415c14b2d2bcc163e..1dae26816d4445f10dee094f10005e741895640a 100644 --- a/Teszteset21.out +++ b/testcases/Teszteset21.out @@ -1,4 +1,4 @@ -myField: f_1_1 -points: 0 -force: 0.0 +myField: f_1_1 +points: 0 +force: 0.0 alive: false \ No newline at end of file diff --git a/Teszteset22.in b/testcases/Teszteset22.in similarity index 92% rename from Teszteset22.in rename to testcases/Teszteset22.in index 89f825d4b6e9c9338b3d5913b1d926d371ae2fbd..24ecb8b7268aec37230bb103cddb28d817609ff2 100644 --- a/Teszteset22.in +++ b/testcases/Teszteset22.in @@ -1,11 +1,11 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -worker w2 5 f_1_2 -worker w3 5 f_1_3 -step w3 left -stat w1 +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +worker w2 5 f_1_2 +worker w3 5 f_1_3 +step w3 left +stat w1 stat w2 \ No newline at end of file diff --git a/Teszteset22.out b/testcases/Teszteset22.out similarity index 93% rename from Teszteset22.out rename to testcases/Teszteset22.out index 97a9d7efb4dae055db611a7672e3b4ec2f786d6f..5563709a869acf60a2ed55a4fac395b9555a77bb 100644 --- a/Teszteset22.out +++ b/testcases/Teszteset22.out @@ -1,8 +1,8 @@ -myField: f_1_1 -points: 0 -force: 0.0 -alive: false -myField: f_1_1 -points: 0 -force: 5.0 +myField: f_1_1 +points: 0 +force: 0.0 +alive: false +myField: f_1_1 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset23.in b/testcases/Teszteset23.in similarity index 92% rename from Teszteset23.in rename to testcases/Teszteset23.in index 60654e32af696c809a9b681540a948242871c9b3..48cc2779873a828e44d11ca498bb9239d58ff6f7 100644 --- a/Teszteset23.in +++ b/testcases/Teszteset23.in @@ -1,15 +1,15 @@ -parsemap 4 6 -wwwwww -wmmsmw -wmmkmw -wwwwww -setswitch f_1_3 f_2_3 -worker w1 5 f_1_1 -crate c1 f_1_2 -crate c2 f_2_2 -step w1 right -step w1 left -step w1 down -step w1 right -stat f_1_3 +parsemap 4 6 +wwwwww +wmmsmw +wmmkmw +wwwwww +setswitch f_1_3 f_2_3 +worker w1 5 f_1_1 +crate c1 f_1_2 +crate c2 f_2_2 +step w1 right +step w1 left +step w1 down +step w1 right +stat f_1_3 stat c1 \ No newline at end of file diff --git a/Teszteset23.out b/testcases/Teszteset23.out similarity index 95% rename from Teszteset23.out rename to testcases/Teszteset23.out index 673699f68e4c5ffd3385816ceb4930e590579593..970c589799c224bdb0929ecebae01f1d4f814b29 100644 --- a/Teszteset23.out +++ b/testcases/Teszteset23.out @@ -1,8 +1,8 @@ -neighborUp: f_0_3 -neighborRight: f_1_4 -neighborDown: f_2_3 -neighborLeft: f_1_2 -moveable: null -fluid: no fluid -opened: true +neighborUp: f_0_3 +neighborRight: f_1_4 +neighborDown: f_2_3 +neighborLeft: f_1_2 +moveable: null +fluid: no fluid +opened: true This doesn't exist! \ No newline at end of file diff --git a/Teszteset24.in b/testcases/Teszteset24.in similarity index 92% rename from Teszteset24.in rename to testcases/Teszteset24.in index 988e59e062fe55b4c6c1d1345f7300e32a4020c4..c39b569c796c82282f9bea02ef618e2cbf092fbd 100644 --- a/Teszteset24.in +++ b/testcases/Teszteset24.in @@ -1,8 +1,8 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -putfluid f_1_1 h +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +putfluid f_1_1 h stat f_1_1 \ No newline at end of file diff --git a/Teszteset24.out b/testcases/Teszteset24.out similarity index 95% rename from Teszteset24.out rename to testcases/Teszteset24.out index e26361943ad1fcc6fa73341a7dbf2ffc5450bf28..f8d6e09c6be29fd60fbb0cdcb5c8713c41322246 100644 --- a/Teszteset24.out +++ b/testcases/Teszteset24.out @@ -1,6 +1,6 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: w1 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: w1 fluid: honey \ No newline at end of file diff --git a/Teszteset25.in b/testcases/Teszteset25.in similarity index 92% rename from Teszteset25.in rename to testcases/Teszteset25.in index 71e6c81a5a078bdd078251ccf9866c0ff7bcf176..93cc4f0503d08a320fcf04143812cfcaf09a58f0 100644 --- a/Teszteset25.in +++ b/testcases/Teszteset25.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -putfluid f_1_1 o -step w1 right -stat f_1_1 +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +putfluid f_1_1 o +step w1 right +stat f_1_1 stat w1 \ No newline at end of file diff --git a/Teszteset25.out b/testcases/Teszteset25.out similarity index 94% rename from Teszteset25.out rename to testcases/Teszteset25.out index a185bc3026763c6919e89160eba4b82f70ab2087..fe54297c6dcd66e5fa024d5a9f2bfd01e5da3e32 100644 --- a/Teszteset25.out +++ b/testcases/Teszteset25.out @@ -1,10 +1,10 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: oil -myField: f_1_2 -points: 0 -force: 5.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: oil +myField: f_1_2 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset26.in b/testcases/Teszteset26.in similarity index 92% rename from Teszteset26.in rename to testcases/Teszteset26.in index 1257ee142e2ed756714859f22a755cd79f047ea5..dd346d0a3195a7cf13f7d11e942114e2561e2ab6 100644 --- a/Teszteset26.in +++ b/testcases/Teszteset26.in @@ -1,9 +1,9 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_1 -putfluid f_1_1 h -putfluid f_1_1 o +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_1 +putfluid f_1_1 h +putfluid f_1_1 o stat f_1_1 \ No newline at end of file diff --git a/Teszteset26.out b/testcases/Teszteset26.out similarity index 95% rename from Teszteset26.out rename to testcases/Teszteset26.out index 301f3de8b803364d547adfbe7133b54dfb4cfd92..cb974f9dfd72dbab16796161c2f4d6c9044ddc74 100644 --- a/Teszteset26.out +++ b/testcases/Teszteset26.out @@ -1,6 +1,6 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: w1 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: w1 fluid: oil \ No newline at end of file diff --git a/Teszteset27.in b/testcases/Teszteset27.in similarity index 93% rename from Teszteset27.in rename to testcases/Teszteset27.in index 4836a10279318efd381644329a0130c4ebdb1c6d..134943ded31ffddb64a081e2c9630b77b858af04 100644 --- a/Teszteset27.in +++ b/testcases/Teszteset27.in @@ -1,13 +1,13 @@ -parsemap 4 7 -wwwwwww -wsmmkmw -wmmmmmw -wwwwwww -setswitch f_1_1 f_1_4 -worker w1 5 f_1_1 -crate c1 f_1_3 -putfluid f_1_1 h -step w1 right -step w1 right -step w1 right +parsemap 4 7 +wwwwwww +wsmmkmw +wmmmmmw +wwwwwww +setswitch f_1_1 f_1_4 +worker w1 5 f_1_1 +crate c1 f_1_3 +putfluid f_1_1 h +step w1 right +step w1 right +step w1 right stat f_1_1 \ No newline at end of file diff --git a/Teszteset27.out b/testcases/Teszteset27.out similarity index 95% rename from Teszteset27.out rename to testcases/Teszteset27.out index 09e3edd65717581d70663fc1c64a88725d7a4b0f..693e8ff2586b4c8fa9a3d40e3f724f3e24823629 100644 --- a/Teszteset27.out +++ b/testcases/Teszteset27.out @@ -1,7 +1,7 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: honey +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: honey opened: false \ No newline at end of file diff --git a/Teszteset28.in b/testcases/Teszteset28.in similarity index 92% rename from Teszteset28.in rename to testcases/Teszteset28.in index 00b0d6f06e163dce1e0ebc859317479d72e49934..5b8ca8d3df4003bfacd2d7b1ecf610ad70780cde 100644 --- a/Teszteset28.in +++ b/testcases/Teszteset28.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 3 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 3 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset28.out b/testcases/Teszteset28.out similarity index 94% rename from Teszteset28.out rename to testcases/Teszteset28.out index 1052764be3cd0ec3f1fe04fb2ebc2b06564c5a5e..8929511af8fbfb4a199d1648de4321f85e7a6abf 100644 --- a/Teszteset28.out +++ b/testcases/Teszteset28.out @@ -1,4 +1,4 @@ -myField: f_1_2 -points: 0 -force: 3.0 +myField: f_1_2 +points: 0 +force: 3.0 alive: true \ No newline at end of file diff --git a/Teszteset29.in b/testcases/Teszteset29.in similarity index 92% rename from Teszteset29.in rename to testcases/Teszteset29.in index cf47f2e8358edbd6390715e8cbec876cb3946f99..9f5cab6e93fce16becaa53b980b78395e3a18e2d 100644 --- a/Teszteset29.in +++ b/testcases/Teszteset29.in @@ -1,10 +1,10 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 2 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 2 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset29.out b/testcases/Teszteset29.out similarity index 94% rename from Teszteset29.out rename to testcases/Teszteset29.out index b5347b5e9375e89402ba8c395e2c2648a6a2d45c..cd381c304e7bf8e848d06701a3f647bf3fcb3798 100644 --- a/Teszteset29.out +++ b/testcases/Teszteset29.out @@ -1,4 +1,4 @@ -myField: f_1_1 -points: 0 -force: 2.0 +myField: f_1_1 +points: 0 +force: 2.0 alive: true \ No newline at end of file diff --git a/Teszteset3.in b/testcases/Teszteset3.in similarity index 89% rename from Teszteset3.in rename to testcases/Teszteset3.in index 9b9d8d2390eed59c2e667c63740e79eab3a613bc..121d84fb95f6bcc8da0f6bf6d206b1af906c3539 100644 --- a/Teszteset3.in +++ b/testcases/Teszteset3.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww - -worker w1 5 f_1_1 -step w1 right - -stat f_1_1 -stat f_1_2 - +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww + +worker w1 5 f_1_1 +step w1 right + +stat f_1_1 +stat f_1_2 + stat w1 \ No newline at end of file diff --git a/Teszteset3.out b/testcases/Teszteset3.out similarity index 94% rename from Teszteset3.out rename to testcases/Teszteset3.out index 73886dd60333ed49f107e0eabae06b2f58ce062d..997430b9bcdd96a148e8a63201f8d61553639ad2 100644 --- a/Teszteset3.out +++ b/testcases/Teszteset3.out @@ -1,16 +1,16 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: no fluid -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: w1 -fluid: no fluid -myField: f_1_2 -points: 0 -force: 5.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: no fluid +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: w1 +fluid: no fluid +myField: f_1_2 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset30.in b/testcases/Teszteset30.in similarity index 92% rename from Teszteset30.in rename to testcases/Teszteset30.in index 88ae9dbb86904d37f547f24371d38f2a4a188abe..8822e60c08cc64ea84815746ad83241bc4c6c445 100644 --- a/Teszteset30.in +++ b/testcases/Teszteset30.in @@ -1,11 +1,11 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 3 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -putfluid f_1_1 h -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 3 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +putfluid f_1_1 h +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset30.out b/testcases/Teszteset30.out similarity index 94% rename from Teszteset30.out rename to testcases/Teszteset30.out index d5847263c2b736d05a9fc7ccc136e8853da681ec..c6226b7e667e3cc8450ef9f22f50b501ed53e60c 100644 --- a/Teszteset30.out +++ b/testcases/Teszteset30.out @@ -1,4 +1,4 @@ -myField: f_1_1 -points: 0 -force: 3.0 +myField: f_1_1 +points: 0 +force: 3.0 alive: true \ No newline at end of file diff --git a/Teszteset31.in b/testcases/Teszteset31.in similarity index 92% rename from Teszteset31.in rename to testcases/Teszteset31.in index fc383e3b60bd5b34b63027785e1b34a3814f53d2..16c563e0f467958b8a8b4ddcbf7e0c8db08cd87a 100644 --- a/Teszteset31.in +++ b/testcases/Teszteset31.in @@ -1,11 +1,11 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 2 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -putfluid f_1_1 o -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 2 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +putfluid f_1_1 o +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset31.out b/testcases/Teszteset31.out similarity index 94% rename from Teszteset31.out rename to testcases/Teszteset31.out index d2cdae09d5837fe21d42ca8a84728eb8f0854079..33a18af7750a27d3dfdbf9f9d5f833f8702d06f0 100644 --- a/Teszteset31.out +++ b/testcases/Teszteset31.out @@ -1,4 +1,4 @@ -myField: f_1_2 -points: 0 -force: 2.0 +myField: f_1_2 +points: 0 +force: 2.0 alive: true \ No newline at end of file diff --git a/Teszteset32.in b/testcases/Teszteset32.in similarity index 93% rename from Teszteset32.in rename to testcases/Teszteset32.in index fa41d986f5770dcd6013cc6b6e43faa089713f35..0c28cafd3c28041176c8519a5367119f47047832 100644 --- a/Teszteset32.in +++ b/testcases/Teszteset32.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 2 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -putfluid f_1_1 o -putfluid f_1_2 o -putfluid f_1_3 h -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 2 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +putfluid f_1_1 o +putfluid f_1_2 o +putfluid f_1_3 h +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset32.out b/testcases/Teszteset32.out similarity index 94% rename from Teszteset32.out rename to testcases/Teszteset32.out index d2cdae09d5837fe21d42ca8a84728eb8f0854079..33a18af7750a27d3dfdbf9f9d5f833f8702d06f0 100644 --- a/Teszteset32.out +++ b/testcases/Teszteset32.out @@ -1,4 +1,4 @@ -myField: f_1_2 -points: 0 -force: 2.0 +myField: f_1_2 +points: 0 +force: 2.0 alive: true \ No newline at end of file diff --git a/Teszteset33.in b/testcases/Teszteset33.in similarity index 93% rename from Teszteset33.in rename to testcases/Teszteset33.in index b5dbe10819e704aec21a0455386bd85fce5c150e..df45b2405717a129c51ca5e19da7356aa6d1c2f4 100644 --- a/Teszteset33.in +++ b/testcases/Teszteset33.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 3 f_1_1 -crate c1 f_1_2 -crate c2 f_1_3 -putfluid f_1_1 o -putfluid f_1_2 h -putfluid f_1_3 h -step w1 right +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 3 f_1_1 +crate c1 f_1_2 +crate c2 f_1_3 +putfluid f_1_1 o +putfluid f_1_2 h +putfluid f_1_3 h +step w1 right stat w1 \ No newline at end of file diff --git a/Teszteset33.out b/testcases/Teszteset33.out similarity index 94% rename from Teszteset33.out rename to testcases/Teszteset33.out index d5847263c2b736d05a9fc7ccc136e8853da681ec..c6226b7e667e3cc8450ef9f22f50b501ed53e60c 100644 --- a/Teszteset33.out +++ b/testcases/Teszteset33.out @@ -1,4 +1,4 @@ -myField: f_1_1 -points: 0 -force: 3.0 +myField: f_1_1 +points: 0 +force: 3.0 alive: true \ No newline at end of file diff --git a/Teszteset4.in b/testcases/Teszteset4.in similarity index 89% rename from Teszteset4.in rename to testcases/Teszteset4.in index 7413b1543aa46e5fe1550fa7b6bbf7a92aa11698..1479b42bc8c456c25bef0b576fe85d48c00a6c01 100644 --- a/Teszteset4.in +++ b/testcases/Teszteset4.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmtmmw -wmmmmw -wwwwww - -worker w1 5 f_1_1 -step w1 right - -stat f_1_1 -stat f_1_2 - -stat w1 +parsemap 4 6 +wwwwww +wmtmmw +wmmmmw +wwwwww + +worker w1 5 f_1_1 +step w1 right + +stat f_1_1 +stat f_1_2 + +stat w1 diff --git a/Teszteset4.out b/testcases/Teszteset4.out similarity index 94% rename from Teszteset4.out rename to testcases/Teszteset4.out index 73886dd60333ed49f107e0eabae06b2f58ce062d..997430b9bcdd96a148e8a63201f8d61553639ad2 100644 --- a/Teszteset4.out +++ b/testcases/Teszteset4.out @@ -1,16 +1,16 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: no fluid -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: w1 -fluid: no fluid -myField: f_1_2 -points: 0 -force: 5.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: no fluid +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: w1 +fluid: no fluid +myField: f_1_2 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset5.in b/testcases/Teszteset5.in similarity index 91% rename from Teszteset5.in rename to testcases/Teszteset5.in index 2141fe94275ac07c8dd845cc620eaf082a09e2e9..df2be72a04834ae20e5f1c26d4637938a4e4d64b 100644 --- a/Teszteset5.in +++ b/testcases/Teszteset5.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmkmmw -wmmsmw -wwwwww -setswitch f_2_3 f_1_2 -worker w1 5 f_1_1 -step w1 right - -stat f_2_3 -stat f_1_2 - +parsemap 4 6 +wwwwww +wmkmmw +wmmsmw +wwwwww +setswitch f_2_3 f_1_2 +worker w1 5 f_1_1 +step w1 right + +stat f_2_3 +stat f_1_2 + stat w1 \ No newline at end of file diff --git a/Teszteset5.out b/testcases/Teszteset5.out similarity index 94% rename from Teszteset5.out rename to testcases/Teszteset5.out index dcc45f7abfc1c0d8d1cb6f5aaca36052818de39e..89d1544169da7f0b753acbce1431737f2d2a1a44 100644 --- a/Teszteset5.out +++ b/testcases/Teszteset5.out @@ -1,18 +1,18 @@ -neighborUp: f_1_3 -neighborRight: f_2_4 -neighborDown: f_3_3 -neighborLeft: f_2_2 -moveable: null -fluid: no fluid -opened: false -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: w1 -fluid: no fluid -sHole: f_2_3 -myField: f_1_2 -points: 0 -force: 5.0 +neighborUp: f_1_3 +neighborRight: f_2_4 +neighborDown: f_3_3 +neighborLeft: f_2_2 +moveable: null +fluid: no fluid +opened: false +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: w1 +fluid: no fluid +sHole: f_2_3 +myField: f_1_2 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset6.in b/testcases/Teszteset6.in similarity index 89% rename from Teszteset6.in rename to testcases/Teszteset6.in index 8d09f13d57f49d1e40482132c79917d44a11cf63..4a6b3ad342789e596f2e6ec7c3bbaa9e60aef117 100644 --- a/Teszteset6.in +++ b/testcases/Teszteset6.in @@ -1,13 +1,13 @@ -parsemap 4 6 -wwwwww -wmhmmw -wmmmmw -wwwwww - -worker w1 5 f_1_1 -step w1 right - -stat f_1_1 -stat f_1_2 - +parsemap 4 6 +wwwwww +wmhmmw +wmmmmw +wwwwww + +worker w1 5 f_1_1 +step w1 right + +stat f_1_1 +stat f_1_2 + stat w1 \ No newline at end of file diff --git a/Teszteset6.out b/testcases/Teszteset6.out similarity index 94% rename from Teszteset6.out rename to testcases/Teszteset6.out index 02ef68a9f15bc08bf7fd9d84d9879c4241c2daf9..e2873cd623ac3dff5e8b48d79bd5c2a2bf943b60 100644 --- a/Teszteset6.out +++ b/testcases/Teszteset6.out @@ -1,16 +1,16 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: no fluid -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: null -fluid: no fluid -myField: f_1_2 -points: 0 -force: 0.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: no fluid +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: null +fluid: no fluid +myField: f_1_2 +points: 0 +force: 0.0 alive: false \ No newline at end of file diff --git a/Teszteset7.in b/testcases/Teszteset7.in similarity index 90% rename from Teszteset7.in rename to testcases/Teszteset7.in index 5a37a6d5ae5e06b8eea07344a13af584aa85371a..f6de2dcdee6c7cb850132606017783a3be066abb 100644 --- a/Teszteset7.in +++ b/testcases/Teszteset7.in @@ -1,16 +1,16 @@ -parsemap 4 6 -wwwwww -wmsmmw -wmkmmw -wwwwww - -setswitch f_1_2 f_2_2 -worker w1 5 f_1_1 -crate c1 f_2_2 - -step w1 right - -stat f_1_1 -stat f_1_2 - +parsemap 4 6 +wwwwww +wmsmmw +wmkmmw +wwwwww + +setswitch f_1_2 f_2_2 +worker w1 5 f_1_1 +crate c1 f_2_2 + +step w1 right + +stat f_1_1 +stat f_1_2 + stat w1 \ No newline at end of file diff --git a/Teszteset7.out b/testcases/Teszteset7.out similarity index 94% rename from Teszteset7.out rename to testcases/Teszteset7.out index ef68d777baf697979bcb385bdc91825506120d09..46784bfe1347ae251a8371a3bc28001fa8ae4819 100644 --- a/Teszteset7.out +++ b/testcases/Teszteset7.out @@ -1,17 +1,17 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: no fluid -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: null -fluid: no fluid -opened: true -myField: f_1_2 -points: 0 -force: 0.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: no fluid +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: null +fluid: no fluid +opened: true +myField: f_1_2 +points: 0 +force: 0.0 alive: false \ No newline at end of file diff --git a/Teszteset8.in b/testcases/Teszteset8.in similarity index 90% rename from Teszteset8.in rename to testcases/Teszteset8.in index 7c560e505c065a1cf0b95238a89f9d58e2286729..579439aa6c9d36ac9fcdd36f1814d1bace3b636a 100644 --- a/Teszteset8.in +++ b/testcases/Teszteset8.in @@ -1,15 +1,15 @@ -parsemap 4 6 -wwwwww -wmsmmw -wmkmmw -wwwwww - -setswitch f_1_2 f_2_2 -worker w1 5 f_1_1 - -step w1 right - -stat f_1_1 -stat f_1_2 - +parsemap 4 6 +wwwwww +wmsmmw +wmkmmw +wwwwww + +setswitch f_1_2 f_2_2 +worker w1 5 f_1_1 + +step w1 right + +stat f_1_1 +stat f_1_2 + stat w1 \ No newline at end of file diff --git a/Teszteset8.out b/testcases/Teszteset8.out similarity index 94% rename from Teszteset8.out rename to testcases/Teszteset8.out index 92a0d602ebd8700771fa2d316e042b2c00a137e2..de0e4f349be2e02dd159ddbf78c02454afbe283e 100644 --- a/Teszteset8.out +++ b/testcases/Teszteset8.out @@ -1,17 +1,17 @@ -neighborUp: f_0_1 -neighborRight: f_1_2 -neighborDown: f_2_1 -neighborLeft: f_1_0 -moveable: null -fluid: no fluid -neighborUp: f_0_2 -neighborRight: f_1_3 -neighborDown: f_2_2 -neighborLeft: f_1_1 -moveable: w1 -fluid: no fluid -opened: false -myField: f_1_2 -points: 0 -force: 5.0 +neighborUp: f_0_1 +neighborRight: f_1_2 +neighborDown: f_2_1 +neighborLeft: f_1_0 +moveable: null +fluid: no fluid +neighborUp: f_0_2 +neighborRight: f_1_3 +neighborDown: f_2_2 +neighborLeft: f_1_1 +moveable: w1 +fluid: no fluid +opened: false +myField: f_1_2 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/Teszteset9.in b/testcases/Teszteset9.in similarity index 90% rename from Teszteset9.in rename to testcases/Teszteset9.in index bcd876138c5e9f38d698bd7cb6746b6a20d7b825..fb17a5b85c57b72d645954684aef350a10cbb6e4 100644 --- a/Teszteset9.in +++ b/testcases/Teszteset9.in @@ -1,14 +1,14 @@ -parsemap 4 6 -wwwwww -wmmmmw -wmmmmw -wwwwww -worker w1 5 f_1_3 -crate c1 f_1_4 - -step w1 right - -stat f_1_3 -stat f_1_4 - +parsemap 4 6 +wwwwww +wmmmmw +wmmmmw +wwwwww +worker w1 5 f_1_3 +crate c1 f_1_4 + +step w1 right + +stat f_1_3 +stat f_1_4 + stat w1 \ No newline at end of file diff --git a/Teszteset9.out b/testcases/Teszteset9.out similarity index 94% rename from Teszteset9.out rename to testcases/Teszteset9.out index fb4ced04c6cfd8d416e50f4c6560855b6337ab2b..5a2845aa9ef560e708b562dbca7903fab43554fd 100644 --- a/Teszteset9.out +++ b/testcases/Teszteset9.out @@ -1,16 +1,16 @@ -neighborUp: f_0_3 -neighborRight: f_1_4 -neighborDown: f_2_3 -neighborLeft: f_1_2 -moveable: w1 -fluid: no fluid -neighborUp: f_0_4 -neighborRight: f_1_5 -neighborDown: f_2_4 -neighborLeft: f_1_3 -moveable: c1 -fluid: no fluid -myField: f_1_3 -points: 0 -force: 5.0 +neighborUp: f_0_3 +neighborRight: f_1_4 +neighborDown: f_2_3 +neighborLeft: f_1_2 +moveable: w1 +fluid: no fluid +neighborUp: f_0_4 +neighborRight: f_1_5 +neighborDown: f_2_4 +neighborLeft: f_1_3 +moveable: c1 +fluid: no fluid +myField: f_1_3 +points: 0 +force: 5.0 alive: true \ No newline at end of file diff --git a/tester.ps1 b/testcases/tester.ps1 similarity index 100% rename from tester.ps1 rename to testcases/tester.ps1 diff --git a/testere.ps1 b/testcases/testere.ps1 similarity index 100% rename from testere.ps1 rename to testcases/testere.ps1