From 9d8317369ed0503aec6d2f0062f1723456238b73 Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:41:16 +0200 Subject: [PATCH 01/11] gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b2040dc..9e6a530 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ bin/main/fr/enssat/dysp/lyrics/Traitement$CharType.class .settings/org.eclipse.buildship.core.prefs .project .classpath + +.idea \ No newline at end of file From e07bf7b060aa9c851f2c8d157fd099914fcd2d1f Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:41:43 +0200 Subject: [PATCH 02/11] Add test sample EvangelionOPFullRomaji --- .../in/EvangelionOPFullRomaji.sample | 58 +++++++++++++++++++ ...nOPFullRomaji.split.optimize.chorus.sample | 58 +++++++++++++++++++ ...angelionOPFullRomaji.split.optimize.sample | 58 +++++++++++++++++++ .../out/EvangelionOPFullRomaji.split.sample | 58 +++++++++++++++++++ 4 files changed, 232 insertions(+) create mode 100644 src/test/resources/in/EvangelionOPFullRomaji.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.sample diff --git a/src/test/resources/in/EvangelionOPFullRomaji.sample b/src/test/resources/in/EvangelionOPFullRomaji.sample new file mode 100644 index 0000000..d139699 --- /dev/null +++ b/src/test/resources/in/EvangelionOPFullRomaji.sample @@ -0,0 +1,58 @@ +Zankoku na tenshi no you ni +Shounen yo shinwa ni nare + +Aoi kaze ga ima +Mune no doa wo tataite mo +Watashi dake wo tada mitsumete +Hohoenderu anata + +Sotto fureru mono +Motomeru koto ni muchuu de +Unmei sae mada shiranai +Itaikena hitomi + +Dakedo itsuka kizuku deshou +Sono senaka ni wa +Haruka mirai mezasu tameno +Hanega ga arukoto + +Zankoku na tenshi no teeze +Madobe kara yagate tobitatsu +Hotobashiru atsui patosu de +Omoide wo uragiru nara +Kono sora wo daite kagayaku +Shounen yo shinwa ni nare + +Zutto nemutteru +Watashi no ai no yurikago +Anata dake ga yume no shisha ni +Yobareru asa ga kuru + +Hosoi kubisuji wo +Tsukiakari ga utsushiteru +Sekaijuu no toki wo tomete +Tojikometai kedo + +Moshimo futari aeta koto ni +Imi ga aru nara +Watashi wa sou +Jiyuu wo shiru tame no baiburu + +Zankoku na tenshi no teeze +Kanashimi ga soshite hajimaru +Dakishimeta inochi no katachi +Sono yume ni mezameta toki +Dare yori mo hikari wo hanatsu +Shounen yo shinwa ni nare + +Hito wa ai wo tsumugi nagara +Rekishi wo tsukuru +Megami nante narenai mama +Watashi wa ikiru + +Zankoku na tenshi no teeze +Madobe kara yagate tobitatsu +Hotobashiru atsui patosu de +Omoide wo uragiru nara +Kono sora wo daite kagayaku +Shounen yo shinwa ni nare \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample new file mode 100644 index 0000000..55c52de --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample @@ -0,0 +1,58 @@ +Zan/ko/ku na ten/shi no you ni +Shou/nen yo shin/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/tai/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/en/de/ru a/na/ta + +Sot/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chuu de +Un/mei sa/e ma/da shi/ra/nai +I/tai/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/shou +So/no se/na/ka ni wa +Ha/ru/ka mi/rai me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re + +Zut/to ne/mut/te/ru +Wa/ta/shi no ai no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/kai/juu no to/ki wo to/me/te +To/ji/ko/me/tai ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa sou +Ji/yuu wo shi/ru ta/me no bai/bu/ru + +Zan/ko/ku na ten/shi no tee/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Shou/nen yo shin/wa ni na/re + +Hi/to wa ai wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi nan/te na/re/nai ma/ma +Wa/ta/shi wa i/ki/ru + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample new file mode 100644 index 0000000..55c52de --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample @@ -0,0 +1,58 @@ +Zan/ko/ku na ten/shi no you ni +Shou/nen yo shin/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/tai/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/en/de/ru a/na/ta + +Sot/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chuu de +Un/mei sa/e ma/da shi/ra/nai +I/tai/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/shou +So/no se/na/ka ni wa +Ha/ru/ka mi/rai me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re + +Zut/to ne/mut/te/ru +Wa/ta/shi no ai no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/kai/juu no to/ki wo to/me/te +To/ji/ko/me/tai ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa sou +Ji/yuu wo shi/ru ta/me no bai/bu/ru + +Zan/ko/ku na ten/shi no tee/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Shou/nen yo shin/wa ni na/re + +Hi/to wa ai wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi nan/te na/re/nai ma/ma +Wa/ta/shi wa i/ki/ru + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.sample new file mode 100644 index 0000000..b0b3045 --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.sample @@ -0,0 +1,58 @@ +Za/n/ko/ku na te/n/shi no yo/u ni +Sho/u/ne/n yo shi/n/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/ta/i/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/e/n/de/ru a/na/ta + +So/t/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chu/u de +U/n/me/i sa/e ma/da shi/ra/na/i +I/ta/i/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/sho/u +So/no se/na/ka ni wa +Ha/ru/ka mi/ra/i me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Za/n/ko/ku na te/n/shi no te/e/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo da/i/te ka/ga/ya/ku +Sho/u/ne/n yo shi/n/wa ni na/re + +Zu/t/to ne/mu/t/te/ru +Wa/ta/shi no a/i no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/ka/i/ju/u no to/ki wo to/me/te +To/ji/ko/me/ta/i ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa so/u +Ji/yu/u wo shi/ru ta/me no ba/i/bu/ru + +Za/n/ko/ku na te/n/shi no te/e/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Sho/u/ne/n yo shi/n/wa ni na/re + +Hi/to wa a/i wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi na/n/te na/re/na/i ma/ma +Wa/ta/shi wa i/ki/ru + +Za/n/ko/ku na te/n/shi no te/e/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo da/i/te ka/ga/ya/ku +Sho/u/ne/n yo shi/n/wa ni na/re \ No newline at end of file From 553d0977cf0590a927555bd62b3d4f4dc3413554 Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:48:31 +0200 Subject: [PATCH 03/11] Add test sample SymphogearRainbowFlower --- .../in/SymphogearRainbowFlower.sample | 49 ++++++++++ ...ymphogearRainbowFlower.split.chorus.sample | 89 +++++++++++++++++++ ...RainbowFlower.split.optimize.chorus.sample | 89 +++++++++++++++++++ ...phogearRainbowFlower.split.optimize.sample | 49 ++++++++++ .../out/SymphogearRainbowFlower.split.sample | 49 ++++++++++ 5 files changed, 325 insertions(+) create mode 100644 src/test/resources/in/SymphogearRainbowFlower.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.sample diff --git a/src/test/resources/in/SymphogearRainbowFlower.sample b/src/test/resources/in/SymphogearRainbowFlower.sample new file mode 100644 index 0000000..26a637e --- /dev/null +++ b/src/test/resources/in/SymphogearRainbowFlower.sample @@ -0,0 +1,49 @@ +(Ye-e-Ye-e Ha-a Kort gungnir messa baggy) +(Ye-e-Ye-e Ha-a Kort gungnir messa brossy…Gungnir) + +Ikuoku no rekishi wo koete +Kono mune no (Go) toikake ni (Go) kotae yo Shine + +Honō yori atsui omoi yo +Kōtetsu no (Go) ikadzuchi de (Go) buttobase My Gungnir + +Saisoku de saitan de icchokusen ni +Hikatta (Fly) asahi wo (Fly) +Kimi to tomo ni mitai (mitai) ima (ima) miageyō + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenryoku de "hitori ja nai" to todoketai + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Waraō…! Kono sekai ni wa uta ga aru + +Nando demo tachiagareru sa +Chotto dake (Go) kita michi wo (Go) mite goran? + +Konna ni mo kagayaite iru +Tsumiageta (Go) monogatari (Go) uso wa nani mo nai + +"Itsuka mirai ni hito wa tsunagareru…" +Daiji na (Fly) tomo kara (Fly) +Moratta kotoba zettai (zettai) yume (yume) tsumugu kara + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenkai de ai no banka yo todoroite + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Yūki mo nani mo kamo wo zenbu tabaneyō + +(Balwisyall nescell gungnir tron) + +Kimi to watashi, minna, minna +Ayumi kitta, ashiato ni donna hana ga saku no kanā? + +Naite, warai, umare ochita, namida, namida… +Kitto kirei na niji no hana ni natte saki utau…! + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenryoku de "hitori ja nai" to todoketai + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Mata au sono hi made egao no "sayonara" da! +Zettai ni…zettai ni…! \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample b/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample new file mode 100644 index 0000000..a381505 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample @@ -0,0 +1,89 @@ + + + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no to/i/ka/ke ni ko/ta/e yo Shi/ne + +Ho/no/u yo/ri a/tsu/i o/mo/i yo +Ko/u/te/tsu no i/ka/dzu/chi de bu/t/to/ba/se My Gu/n/gni/r + +Sa/i/so/ku de sa/i/ta/n de i/c/cho/ku/se/n ni +Hi/ka/t/ta a/sa/hi wo +Ki/mi to to/mo ni mi/ta/i i/ma mi/a/ge/yo/u + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Wa/ra/o/u…! Ko/no se/ka/i ni wa u/ta ga a/ru + +Na/n/do de/mo ta/chi/a/ga/re/ru sa +Cho/t/to da/ke ki/ta mi/chi wo mi/te go/ra/n? + +Ko/n/na ni mo ka/ga/ya/i/te i/ru +Tsu/mi/a/ge/ta mo/no/ga/ta/ri u/so wa na/ni mo na/i + +"I/tsu/ka mi/ra/i ni hi/to wa tsu/na/ga/re/ru… " +Da/i/ji na to/mo ka/ra +Mo/ra/t/ta ko/to/ba ze/t/ta/i yu/me tsu/mu/gu ka/ra + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ka/i de a/i no ba/n/ka yo to/do/ro/i/te + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Yu/u/ki mo na/ni mo ka/mo wo ze/n/bu ta/ba/ne/yo/u + + + +Ki/mi to wa/ta/shi, mi/n/na, mi/n/na +A/yu/mi ki/t/ta, a/shi/a/to ni do/n/na ha/na ga sa/ku no ka/na/a? + +Na/i/te, wa/ra/i, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Ki/t/to ki/re/i na ni/ji no ha/na ni na/t/te sa/ki u/ta/u…! + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Ze/t/ta/i ni… ze/t/ta/i ni…! + +***CHORUS START*** + +Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy +Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r +Go +Go +Go +Go +Fly +Fly +mi/ta/i +i/ma +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Go +Go +Go +Go +Fly +Fly +ze/t/ta/i +yu/me +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample new file mode 100644 index 0000000..0d0fa2a --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample @@ -0,0 +1,89 @@ + + + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no to/i/ka/ke ni ko/ta/e yo Shi/ne + +Ho/nou yo/ri a/tsu/i o/mo/i yo +Kou/te/tsu no i/ka/dzu/chi de but/to/ba/se My Gun/gni/r + +Sai/so/ku de sai/tan de ic/cho/ku/sen ni +Hi/kat/ta a/sa/hi wo +Ki/mi to to/mo ni mi/tai i/ma mi/a/ge/you + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Wa/ra/ou…! Ko/no se/kai ni wa u/ta ga a/ru + +Nan/do de/mo ta/chi/a/ga/re/ru sa +Chot/to da/ke ki/ta mi/chi wo mi/te go/ran? + +Kon/na ni mo ka/ga/yai/te i/ru +Tsu/mi/a/ge/ta mo/no/ga/ta/ri u/so wa na/ni mo nai + +"I/tsu/ka mi/rai ni hi/to wa tsu/na/ga/re/ru… " +Dai/ji na to/mo ka/ra +Mo/rat/ta ko/to/ba zet/tai yu/me tsu/mu/gu ka/ra + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/kai de ai no ban/ka yo to/do/ro/i/te + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Yuu/ki mo na/ni mo ka/mo wo zen/bu ta/ba/ne/you + + + +Ki/mi to wa/ta/shi, min/na, min/na +A/yu/mi kit/ta, a/shi/a/to ni don/na ha/na ga sa/ku no ka/naa? + +Nai/te, wa/rai, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Kit/to ki/rei na ni/ji no ha/na ni nat/te sa/ki u/ta/u…! + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Zet/tai ni… zet/tai ni…! + +***CHORUS START*** + +Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bag/gy +Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bros/sy… Gun/gni/r +Go +Go +Go +Go +Fly +Fly +mi/tai +i/ma +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Go +Go +Go +Go +Fly +Fly +zet/tai +yu/me +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Ba/lwi/sya/l/l ne/sce/l/l gun/gni/r tron +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample new file mode 100644 index 0000000..f6a9ec2 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample @@ -0,0 +1,49 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bag/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bros/sy… Gun/gni/r) + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no (Go) to/i/ka/ke ni (Go) ko/ta/e yo Shi/ne + +Ho/nou yo/ri a/tsu/i o/mo/i yo +Kou/te/tsu no (Go) i/ka/dzu/chi de (Go) but/to/ba/se My Gun/gni/r + +Sai/so/ku de sai/tan de ic/cho/ku/sen ni +Hi/kat/ta (Fly) a/sa/hi wo (Fly) +Ki/mi to to/mo ni mi/tai (mi/tai) i/ma (i/ma) mi/a/ge/you + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Wa/ra/ou…! Ko/no se/kai ni wa u/ta ga a/ru + +Nan/do de/mo ta/chi/a/ga/re/ru sa +Chot/to da/ke (Go) ki/ta mi/chi wo (Go) mi/te go/ran? + +Kon/na ni mo ka/ga/yai/te i/ru +Tsu/mi/a/ge/ta (Go) mo/no/ga/ta/ri (Go) u/so wa na/ni mo nai + +"I/tsu/ka mi/rai ni hi/to wa tsu/na/ga/re/ru… " +Dai/ji na (Fly) to/mo ka/ra (Fly) +Mo/rat/ta ko/to/ba zet/tai (zet/tai) yu/me (yu/me) tsu/mu/gu ka/ra + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/kai de ai no ban/ka yo to/do/ro/i/te + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Yuu/ki mo na/ni mo ka/mo wo zen/bu ta/ba/ne/you + +(Ba/lwi/sya/l/l ne/sce/l/l gun/gni/r tron) + +Ki/mi to wa/ta/shi, min/na, min/na +A/yu/mi kit/ta, a/shi/a/to ni don/na ha/na ga sa/ku no ka/naa? + +Nai/te, wa/rai, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Kit/to ki/rei na ni/ji no ha/na ni nat/te sa/ki u/ta/u…! + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Zet/tai ni… zet/tai ni…! \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.sample b/src/test/resources/out/SymphogearRainbowFlower.split.sample new file mode 100644 index 0000000..02dc91c --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.sample @@ -0,0 +1,49 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r) + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no (Go) to/i/ka/ke ni (Go) ko/ta/e yo Shi/ne + +Ho/no/u yo/ri a/tsu/i o/mo/i yo +Ko/u/te/tsu no (Go) i/ka/dzu/chi de (Go) bu/t/to/ba/se My Gu/n/gni/r + +Sa/i/so/ku de sa/i/ta/n de i/c/cho/ku/se/n ni +Hi/ka/t/ta (Fly) a/sa/hi wo (Fly) +Ki/mi to to/mo ni mi/ta/i (mi/ta/i) i/ma (i/ma) mi/a/ge/yo/u + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Wa/ra/o/u…! Ko/no se/ka/i ni wa u/ta ga a/ru + +Na/n/do de/mo ta/chi/a/ga/re/ru sa +Cho/t/to da/ke (Go) ki/ta mi/chi wo (Go) mi/te go/ra/n? + +Ko/n/na ni mo ka/ga/ya/i/te i/ru +Tsu/mi/a/ge/ta (Go) mo/no/ga/ta/ri (Go) u/so wa na/ni mo na/i + +"I/tsu/ka mi/ra/i ni hi/to wa tsu/na/ga/re/ru… " +Da/i/ji na (Fly) to/mo ka/ra (Fly) +Mo/ra/t/ta ko/to/ba ze/t/ta/i (ze/t/ta/i) yu/me (yu/me) tsu/mu/gu ka/ra + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ka/i de a/i no ba/n/ka yo to/do/ro/i/te + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Yu/u/ki mo na/ni mo ka/mo wo ze/n/bu ta/ba/ne/yo/u + +(Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n) + +Ki/mi to wa/ta/shi, mi/n/na, mi/n/na +A/yu/mi ki/t/ta, a/shi/a/to ni do/n/na ha/na ga sa/ku no ka/na/a? + +Na/i/te, wa/ra/i, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Ki/t/to ki/re/i na ni/ji no ha/na ni na/t/te sa/ki u/ta/u…! + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Ze/t/ta/i ni… ze/t/ta/i ni…! \ No newline at end of file From df8581f49c73564d608e78e30fcb765ae2dcf921 Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 22:07:33 +0200 Subject: [PATCH 04/11] Add kanji samples --- .../resources/in/EvangelionOPFullKanji.sample | 48 +++++++++++++++++++ .../in/SymphogearRainbowFlowerKanji.sample | 48 +++++++++++++++++++ .../out/EvangelionOPFullKanji.split.sample | 48 +++++++++++++++++++ .../SymphogearRainbowFlowerKanji.split.sample | 48 +++++++++++++++++++ 4 files changed, 192 insertions(+) create mode 100644 src/test/resources/in/EvangelionOPFullKanji.sample create mode 100644 src/test/resources/in/SymphogearRainbowFlowerKanji.sample create mode 100644 src/test/resources/out/EvangelionOPFullKanji.split.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample diff --git a/src/test/resources/in/EvangelionOPFullKanji.sample b/src/test/resources/in/EvangelionOPFullKanji.sample new file mode 100644 index 0000000..1e45243 --- /dev/null +++ b/src/test/resources/in/EvangelionOPFullKanji.sample @@ -0,0 +1,48 @@ +残酷な天使のように +少年よ 神話になれ +蒼い風がいま +胸のドアを叩いても +私だけをただ見つめて +微笑んでるあなた +そっとふれるもの +もとめることに夢中で +運命さえまだ知らない +いたいけな瞳 +だけどいつか気付くでしょう +その背中には +遥か未来 めざすための +羽根があること +残酷な天使のテーゼ +窓辺からやがて飛び立つ +ほとばしる熱いパトスで +思い出を裏切るなら +この宇宙(そら)を抱いて輝く +少年よ 神話になれ +ずっと眠ってる +私の愛の揺りかご +あなただけが 夢の使者に +呼ばれる朝がくる +細い首筋を +月あかりが映してる +世界中の時を止めて +閉じこめたいけど +もしもふたり逢えたことに +意味があるなら +私はそう 自由を知る +ためのバイブル +残酷な天使のテーゼ +悲しみがそしてはじまる +抱きしめた命のかたち +その夢に目覚めたとき +誰よりも光を放つ +少年よ 神話になれ +人は愛をつむぎながら +歴史をつくる +女神なんてなれないまま +私は生きる +残酷な天使のテーゼ +窓辺からやがて飛び立つ +ほとばしる熱いパトスで +思い出を裏切るなら +この宇宙(そら)を抱いて輝く +少年よ 神話になれ \ No newline at end of file diff --git a/src/test/resources/in/SymphogearRainbowFlowerKanji.sample b/src/test/resources/in/SymphogearRainbowFlowerKanji.sample new file mode 100644 index 0000000..e14f715 --- /dev/null +++ b/src/test/resources/in/SymphogearRainbowFlowerKanji.sample @@ -0,0 +1,48 @@ +(Ye-e-Ye-e Ha-a Kort gungnir messa baggy) +(Ye-e-Ye-e Ha-a Kort gungnir messa brossy…Gungnir) + +幾億の歴史を超えて +この胸の (Go) 問いかけに (Go) 応えよShine + +焔より熱い想いよ +鋼鉄の (Go) イカヅチで (Go) ぶっ飛ばせMy Gungnir + +最速で最短で一直線に +光った (Fly) 朝日を (Fly) +君と共に 見たい (見たい) 今 (今) 見上げよう + +響け (響け) 伝え (伝え) 歌え (歌え) +全力で 「一人じゃない」と届けたい + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! 笑おう…! この世界には 歌がある + +何度でも立ち上がれるさ +ちょっとだけ (Go) 来た道を (Go) 見てごらん? + +こんなにも輝いている +積み上げた (Go) 物語 (Go) 嘘は何もない + +「いつか未来に人は繋がれる…」 +大事な (Fly) 友から (Fly) +貰った言葉 絶対 (絶対) 夢 (夢) 紡ぐから + +響け (響け) 伝え (伝え) 歌え (歌え) +全開で 愛の挽歌よ轟いて + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! 勇気も何もかもを 全部束ねよう + +(Balwisyall nescell gungnir tron) + +君と私、みんな、みんな +歩みきった、足跡に どんな花が咲くのかなぁ? +泣いて、笑い、生まれ落ちた、涙、なみだ… +きっと 綺麗な虹の花になって 咲き歌う…! + +響け (響け) 伝え (伝え) 歌え (歌え) +全力で 「一人じゃない」と届けたい + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! また会うその日まで笑顔の 「サヨナラ」だ! +絶対に…絶対に…ッ! \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullKanji.split.sample b/src/test/resources/out/EvangelionOPFullKanji.split.sample new file mode 100644 index 0000000..f67149d --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullKanji.split.sample @@ -0,0 +1,48 @@ +残/酷/な/天/使/の/よ/う/に +少/年/よ 神/話/に/な/れ +蒼/い/風/が/い/ま +胸/の/ド/ア/を/叩/い/て/も +私/だ/け/を/た/だ/見/つ/め/て +微/笑/ん/で/る/あ/な/た +そ/っと/ふ/れ/る/も/の +も/と/め/る/こ/と/に/夢/中/で +運/命/さ/え/ま/だ/知/ら/な/い +い/た/い/け/な/瞳 +だ/け/ど/い/つ/か/気/付/く/で/しょ/う +そ/の/背/中/に/は +遥/か/未/来 め/ざ/す/た/め/の +羽/根/が/あ/る/こ/と +残/酷/な/天/使/の/テー/ゼ +窓/辺/か/ら/や/が/て/飛/び/立/つ +ほ/と/ば/し/る/熱/い/パ/ト/ス/で +思/い/出/を/裏/切/る/な/ら +こ/の/宇/宙(そ/ら)を/抱/い/て/輝/く +少/年/よ 神/話/に/な/れ +ず/っと/眠/って/る +私/の/愛/の/揺/り/か/ご +あ/な/た/だ/け/が 夢/の/使/者/に +呼/ば/れ/る/朝/が/く/る +細/い/首/筋/を +月/あ/か/り/が/映/し/て/る +世/界/中/の/時/を/止/め/て +閉/じ/こ/め/た/い/け/ど +も/し/も/ふ/た/り/逢/え/た/こ/と/に +意/味/が/あ/る/な/ら +私/は/そ/う 自/由/を/知/る +た/め/の/バ/イ/ブ/ル +残/酷/な/天/使/の/テー/ゼ +悲/し/み/が/そ/し/て/は/じ/ま/る +抱/き/し/め/た/命/の/か/た/ち +そ/の/夢/に/目/覚/め/た/と/き +誰/よ/り/も/光/を/放/つ +少/年/よ 神/話/に/な/れ +人/は/愛/を/つ/む/ぎ/な/が/ら +歴/史/を/つ/く/る +女/神/な/ん/て/な/れ/な/い/ま/ま +私/は/生/き/る +残/酷/な/天/使/の/テー/ゼ +窓/辺/か/ら/や/が/て/飛/び/立/つ +ほ/と/ば/し/る/熱/い/パ/ト/ス/で +思/い/出/を/裏/切/る/な/ら +こ/の/宇/宙(そ/ら)を/抱/い/て/輝/く +少/年/よ 神/話/に/な/れ \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample b/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample new file mode 100644 index 0000000..d224338 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample @@ -0,0 +1,48 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r) + +幾/億/の/歴/史/を/超/え/て +こ/の/胸/の (Go) 問/い/か/け/に (Go) 応/え/よ/Shi/ne + +焔/よ/り/熱/い/想/い/よ +鋼/鉄/の (Go) イ/カ/ヅ/チ/で (Go) ぶ/っ/飛/ば/せ/My Gu/n/gni/r + +最/速/で/最/短/で/一/直/線/に +光/った (Fly) 朝/日/を (Fly) +君/と/共/に 見/た/い (見/た/い) 今 (今) 見/上/げ/よ/う + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/力/で 「一/人/じゃ/な/い」と/届/け/た/い + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! 笑/お/う…! こ/の/世/界/に/は 歌/が/あ/る + +何/度/で/も/立/ち/上/が/れ/る/さ +ちょ/っと/だ/け (Go) 来/た/道/を (Go) 見/て/ご/ら/ん? + +こ/ん/な/に/も/輝/い/て/い/る +積/み/上/げ/た (Go) 物/語 (Go) 嘘/は/何/も/な/い + +「い/つ/か/未/来/に/人/は/繋/が/れ/る… 」 +大/事/な (Fly) 友/か/ら (Fly) +貰/った/言/葉 絶/対 (絶/対) 夢 (夢) 紡/ぐ/か/ら + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/開/で 愛/の/挽/歌/よ/轟/い/て + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! 勇/気/も/何/も/か/も/を 全/部/束/ね/よ/う + +(Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n) + +君/と/私、/み/ん/な、/み/ん/な +歩/み/き/った、/足/跡/に ど/ん/な/花/が/咲/く/の/か/な/ぁ? +泣/い/て、/笑/い、/生/ま/れ/落/ち/た、/涙、/な/み/だ… +き/っと 綺/麗/な/虹/の/花/に/な/って 咲/き/歌/う…! + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/力/で 「一/人/じゃ/な/い」と/届/け/た/い + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! ま/た/会/う/そ/の/日/ま/で/笑/顔/の 「サ/ヨ/ナ/ラ」だ! +絶/対/に… 絶/対/に… ッ! \ No newline at end of file From 0acd1c0bd45d7092d9bdd79c5b1c3df57ee5a65a Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:41:16 +0200 Subject: [PATCH 05/11] gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b2040dc..9e6a530 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ bin/main/fr/enssat/dysp/lyrics/Traitement$CharType.class .settings/org.eclipse.buildship.core.prefs .project .classpath + +.idea \ No newline at end of file From a2f6f50a802d390eb3810226d67b15fc0958351c Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:41:43 +0200 Subject: [PATCH 06/11] Add test sample EvangelionOPFullRomaji --- .../in/EvangelionOPFullRomaji.sample | 58 +++++++++++++++++++ ...nOPFullRomaji.split.optimize.chorus.sample | 58 +++++++++++++++++++ ...angelionOPFullRomaji.split.optimize.sample | 58 +++++++++++++++++++ .../out/EvangelionOPFullRomaji.split.sample | 58 +++++++++++++++++++ 4 files changed, 232 insertions(+) create mode 100644 src/test/resources/in/EvangelionOPFullRomaji.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample create mode 100644 src/test/resources/out/EvangelionOPFullRomaji.split.sample diff --git a/src/test/resources/in/EvangelionOPFullRomaji.sample b/src/test/resources/in/EvangelionOPFullRomaji.sample new file mode 100644 index 0000000..d139699 --- /dev/null +++ b/src/test/resources/in/EvangelionOPFullRomaji.sample @@ -0,0 +1,58 @@ +Zankoku na tenshi no you ni +Shounen yo shinwa ni nare + +Aoi kaze ga ima +Mune no doa wo tataite mo +Watashi dake wo tada mitsumete +Hohoenderu anata + +Sotto fureru mono +Motomeru koto ni muchuu de +Unmei sae mada shiranai +Itaikena hitomi + +Dakedo itsuka kizuku deshou +Sono senaka ni wa +Haruka mirai mezasu tameno +Hanega ga arukoto + +Zankoku na tenshi no teeze +Madobe kara yagate tobitatsu +Hotobashiru atsui patosu de +Omoide wo uragiru nara +Kono sora wo daite kagayaku +Shounen yo shinwa ni nare + +Zutto nemutteru +Watashi no ai no yurikago +Anata dake ga yume no shisha ni +Yobareru asa ga kuru + +Hosoi kubisuji wo +Tsukiakari ga utsushiteru +Sekaijuu no toki wo tomete +Tojikometai kedo + +Moshimo futari aeta koto ni +Imi ga aru nara +Watashi wa sou +Jiyuu wo shiru tame no baiburu + +Zankoku na tenshi no teeze +Kanashimi ga soshite hajimaru +Dakishimeta inochi no katachi +Sono yume ni mezameta toki +Dare yori mo hikari wo hanatsu +Shounen yo shinwa ni nare + +Hito wa ai wo tsumugi nagara +Rekishi wo tsukuru +Megami nante narenai mama +Watashi wa ikiru + +Zankoku na tenshi no teeze +Madobe kara yagate tobitatsu +Hotobashiru atsui patosu de +Omoide wo uragiru nara +Kono sora wo daite kagayaku +Shounen yo shinwa ni nare \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample new file mode 100644 index 0000000..55c52de --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.chorus.sample @@ -0,0 +1,58 @@ +Zan/ko/ku na ten/shi no you ni +Shou/nen yo shin/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/tai/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/en/de/ru a/na/ta + +Sot/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chuu de +Un/mei sa/e ma/da shi/ra/nai +I/tai/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/shou +So/no se/na/ka ni wa +Ha/ru/ka mi/rai me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re + +Zut/to ne/mut/te/ru +Wa/ta/shi no ai no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/kai/juu no to/ki wo to/me/te +To/ji/ko/me/tai ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa sou +Ji/yuu wo shi/ru ta/me no bai/bu/ru + +Zan/ko/ku na ten/shi no tee/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Shou/nen yo shin/wa ni na/re + +Hi/to wa ai wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi nan/te na/re/nai ma/ma +Wa/ta/shi wa i/ki/ru + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample new file mode 100644 index 0000000..55c52de --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.optimize.sample @@ -0,0 +1,58 @@ +Zan/ko/ku na ten/shi no you ni +Shou/nen yo shin/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/tai/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/en/de/ru a/na/ta + +Sot/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chuu de +Un/mei sa/e ma/da shi/ra/nai +I/tai/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/shou +So/no se/na/ka ni wa +Ha/ru/ka mi/rai me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re + +Zut/to ne/mut/te/ru +Wa/ta/shi no ai no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/kai/juu no to/ki wo to/me/te +To/ji/ko/me/tai ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa sou +Ji/yuu wo shi/ru ta/me no bai/bu/ru + +Zan/ko/ku na ten/shi no tee/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Shou/nen yo shin/wa ni na/re + +Hi/to wa ai wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi nan/te na/re/nai ma/ma +Wa/ta/shi wa i/ki/ru + +Zan/ko/ku na ten/shi no tee/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo dai/te ka/ga/ya/ku +Shou/nen yo shin/wa ni na/re \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullRomaji.split.sample b/src/test/resources/out/EvangelionOPFullRomaji.split.sample new file mode 100644 index 0000000..b0b3045 --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullRomaji.split.sample @@ -0,0 +1,58 @@ +Za/n/ko/ku na te/n/shi no yo/u ni +Sho/u/ne/n yo shi/n/wa ni na/re + +A/o/i ka/ze ga i/ma +Mu/ne no do/a wo ta/ta/i/te mo +Wa/ta/shi da/ke wo ta/da mi/tsu/me/te +Ho/ho/e/n/de/ru a/na/ta + +So/t/to fu/re/ru mo/no +Mo/to/me/ru ko/to ni mu/chu/u de +U/n/me/i sa/e ma/da shi/ra/na/i +I/ta/i/ke/na hi/to/mi + +Da/ke/do i/tsu/ka ki/zu/ku de/sho/u +So/no se/na/ka ni wa +Ha/ru/ka mi/ra/i me/za/su ta/me/no +Ha/ne/ga ga a/ru/ko/to + +Za/n/ko/ku na te/n/shi no te/e/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo da/i/te ka/ga/ya/ku +Sho/u/ne/n yo shi/n/wa ni na/re + +Zu/t/to ne/mu/t/te/ru +Wa/ta/shi no a/i no yu/ri/ka/go +A/na/ta da/ke ga yu/me no shi/sha ni +Yo/ba/re/ru a/sa ga ku/ru + +Ho/so/i ku/bi/su/ji wo +Tsu/ki/a/ka/ri ga u/tsu/shi/te/ru +Se/ka/i/ju/u no to/ki wo to/me/te +To/ji/ko/me/ta/i ke/do + +Mo/shi/mo fu/ta/ri a/e/ta ko/to ni +I/mi ga a/ru na/ra +Wa/ta/shi wa so/u +Ji/yu/u wo shi/ru ta/me no ba/i/bu/ru + +Za/n/ko/ku na te/n/shi no te/e/ze +Ka/na/shi/mi ga so/shi/te ha/ji/ma/ru +Da/ki/shi/me/ta i/no/chi no ka/ta/chi +So/no yu/me ni me/za/me/ta to/ki +Da/re yo/ri mo hi/ka/ri wo ha/na/tsu +Sho/u/ne/n yo shi/n/wa ni na/re + +Hi/to wa a/i wo tsu/mu/gi na/ga/ra +Re/ki/shi wo tsu/ku/ru +Me/ga/mi na/n/te na/re/na/i ma/ma +Wa/ta/shi wa i/ki/ru + +Za/n/ko/ku na te/n/shi no te/e/ze +Ma/do/be ka/ra ya/ga/te to/bi/ta/tsu +Ho/to/ba/shi/ru a/tsu/i pa/to/su de +O/mo/i/de wo u/ra/gi/ru na/ra +Ko/no so/ra wo da/i/te ka/ga/ya/ku +Sho/u/ne/n yo shi/n/wa ni na/re \ No newline at end of file From d38c4204f78503142426969775b0ea31ba34a311 Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 21:48:31 +0200 Subject: [PATCH 07/11] Add test sample SymphogearRainbowFlower --- .../in/SymphogearRainbowFlower.sample | 49 ++++++++++ ...ymphogearRainbowFlower.split.chorus.sample | 89 +++++++++++++++++++ ...RainbowFlower.split.optimize.chorus.sample | 89 +++++++++++++++++++ ...phogearRainbowFlower.split.optimize.sample | 49 ++++++++++ .../out/SymphogearRainbowFlower.split.sample | 49 ++++++++++ 5 files changed, 325 insertions(+) create mode 100644 src/test/resources/in/SymphogearRainbowFlower.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlower.split.sample diff --git a/src/test/resources/in/SymphogearRainbowFlower.sample b/src/test/resources/in/SymphogearRainbowFlower.sample new file mode 100644 index 0000000..26a637e --- /dev/null +++ b/src/test/resources/in/SymphogearRainbowFlower.sample @@ -0,0 +1,49 @@ +(Ye-e-Ye-e Ha-a Kort gungnir messa baggy) +(Ye-e-Ye-e Ha-a Kort gungnir messa brossy…Gungnir) + +Ikuoku no rekishi wo koete +Kono mune no (Go) toikake ni (Go) kotae yo Shine + +Honō yori atsui omoi yo +Kōtetsu no (Go) ikadzuchi de (Go) buttobase My Gungnir + +Saisoku de saitan de icchokusen ni +Hikatta (Fly) asahi wo (Fly) +Kimi to tomo ni mitai (mitai) ima (ima) miageyō + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenryoku de "hitori ja nai" to todoketai + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Waraō…! Kono sekai ni wa uta ga aru + +Nando demo tachiagareru sa +Chotto dake (Go) kita michi wo (Go) mite goran? + +Konna ni mo kagayaite iru +Tsumiageta (Go) monogatari (Go) uso wa nani mo nai + +"Itsuka mirai ni hito wa tsunagareru…" +Daiji na (Fly) tomo kara (Fly) +Moratta kotoba zettai (zettai) yume (yume) tsumugu kara + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenkai de ai no banka yo todoroite + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Yūki mo nani mo kamo wo zenbu tabaneyō + +(Balwisyall nescell gungnir tron) + +Kimi to watashi, minna, minna +Ayumi kitta, ashiato ni donna hana ga saku no kanā? + +Naite, warai, umare ochita, namida, namida… +Kitto kirei na niji no hana ni natte saki utau…! + +Hibike (hibike) tsutae (tsutae) utae (utae) +Zenryoku de "hitori ja nai" to todoketai + +Hibike (hibike) tsutae (tsutae) utae (utae) +Soshite! Mata au sono hi made egao no "sayonara" da! +Zettai ni…zettai ni…! \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample b/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample new file mode 100644 index 0000000..a381505 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.chorus.sample @@ -0,0 +1,89 @@ + + + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no to/i/ka/ke ni ko/ta/e yo Shi/ne + +Ho/no/u yo/ri a/tsu/i o/mo/i yo +Ko/u/te/tsu no i/ka/dzu/chi de bu/t/to/ba/se My Gu/n/gni/r + +Sa/i/so/ku de sa/i/ta/n de i/c/cho/ku/se/n ni +Hi/ka/t/ta a/sa/hi wo +Ki/mi to to/mo ni mi/ta/i i/ma mi/a/ge/yo/u + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Wa/ra/o/u…! Ko/no se/ka/i ni wa u/ta ga a/ru + +Na/n/do de/mo ta/chi/a/ga/re/ru sa +Cho/t/to da/ke ki/ta mi/chi wo mi/te go/ra/n? + +Ko/n/na ni mo ka/ga/ya/i/te i/ru +Tsu/mi/a/ge/ta mo/no/ga/ta/ri u/so wa na/ni mo na/i + +"I/tsu/ka mi/ra/i ni hi/to wa tsu/na/ga/re/ru… " +Da/i/ji na to/mo ka/ra +Mo/ra/t/ta ko/to/ba ze/t/ta/i yu/me tsu/mu/gu ka/ra + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ka/i de a/i no ba/n/ka yo to/do/ro/i/te + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Yu/u/ki mo na/ni mo ka/mo wo ze/n/bu ta/ba/ne/yo/u + + + +Ki/mi to wa/ta/shi, mi/n/na, mi/n/na +A/yu/mi ki/t/ta, a/shi/a/to ni do/n/na ha/na ga sa/ku no ka/na/a? + +Na/i/te, wa/ra/i, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Ki/t/to ki/re/i na ni/ji no ha/na ni na/t/te sa/ki u/ta/u…! + +Hi/bi/ke tsu/ta/e u/ta/e +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Ze/t/ta/i ni… ze/t/ta/i ni…! + +***CHORUS START*** + +Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy +Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r +Go +Go +Go +Go +Fly +Fly +mi/ta/i +i/ma +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Go +Go +Go +Go +Fly +Fly +ze/t/ta/i +yu/me +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample new file mode 100644 index 0000000..0d0fa2a --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.chorus.sample @@ -0,0 +1,89 @@ + + + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no to/i/ka/ke ni ko/ta/e yo Shi/ne + +Ho/nou yo/ri a/tsu/i o/mo/i yo +Kou/te/tsu no i/ka/dzu/chi de but/to/ba/se My Gun/gni/r + +Sai/so/ku de sai/tan de ic/cho/ku/sen ni +Hi/kat/ta a/sa/hi wo +Ki/mi to to/mo ni mi/tai i/ma mi/a/ge/you + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Wa/ra/ou…! Ko/no se/kai ni wa u/ta ga a/ru + +Nan/do de/mo ta/chi/a/ga/re/ru sa +Chot/to da/ke ki/ta mi/chi wo mi/te go/ran? + +Kon/na ni mo ka/ga/yai/te i/ru +Tsu/mi/a/ge/ta mo/no/ga/ta/ri u/so wa na/ni mo nai + +"I/tsu/ka mi/rai ni hi/to wa tsu/na/ga/re/ru… " +Dai/ji na to/mo ka/ra +Mo/rat/ta ko/to/ba zet/tai yu/me tsu/mu/gu ka/ra + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/kai de ai no ban/ka yo to/do/ro/i/te + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Yuu/ki mo na/ni mo ka/mo wo zen/bu ta/ba/ne/you + + + +Ki/mi to wa/ta/shi, min/na, min/na +A/yu/mi kit/ta, a/shi/a/to ni don/na ha/na ga sa/ku no ka/naa? + +Nai/te, wa/rai, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Kit/to ki/rei na ni/ji no ha/na ni nat/te sa/ki u/ta/u…! + +Hi/bi/ke tsu/ta/e u/ta/e +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke tsu/ta/e u/ta/e +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Zet/tai ni… zet/tai ni…! + +***CHORUS START*** + +Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bag/gy +Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bros/sy… Gun/gni/r +Go +Go +Go +Go +Fly +Fly +mi/tai +i/ma +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Go +Go +Go +Go +Fly +Fly +zet/tai +yu/me +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e +Ba/lwi/sya/l/l ne/sce/l/l gun/gni/r tron +hi/bi/ke +tsu/ta/e +u/ta/e +hi/bi/ke +tsu/ta/e +u/ta/e \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample new file mode 100644 index 0000000..f6a9ec2 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.optimize.sample @@ -0,0 +1,49 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bag/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gun/gni/r mes/sa bros/sy… Gun/gni/r) + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no (Go) to/i/ka/ke ni (Go) ko/ta/e yo Shi/ne + +Ho/nou yo/ri a/tsu/i o/mo/i yo +Kou/te/tsu no (Go) i/ka/dzu/chi de (Go) but/to/ba/se My Gun/gni/r + +Sai/so/ku de sai/tan de ic/cho/ku/sen ni +Hi/kat/ta (Fly) a/sa/hi wo (Fly) +Ki/mi to to/mo ni mi/tai (mi/tai) i/ma (i/ma) mi/a/ge/you + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Wa/ra/ou…! Ko/no se/kai ni wa u/ta ga a/ru + +Nan/do de/mo ta/chi/a/ga/re/ru sa +Chot/to da/ke (Go) ki/ta mi/chi wo (Go) mi/te go/ran? + +Kon/na ni mo ka/ga/yai/te i/ru +Tsu/mi/a/ge/ta (Go) mo/no/ga/ta/ri (Go) u/so wa na/ni mo nai + +"I/tsu/ka mi/rai ni hi/to wa tsu/na/ga/re/ru… " +Dai/ji na (Fly) to/mo ka/ra (Fly) +Mo/rat/ta ko/to/ba zet/tai (zet/tai) yu/me (yu/me) tsu/mu/gu ka/ra + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/kai de ai no ban/ka yo to/do/ro/i/te + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Yuu/ki mo na/ni mo ka/mo wo zen/bu ta/ba/ne/you + +(Ba/lwi/sya/l/l ne/sce/l/l gun/gni/r tron) + +Ki/mi to wa/ta/shi, min/na, min/na +A/yu/mi kit/ta, a/shi/a/to ni don/na ha/na ga sa/ku no ka/naa? + +Nai/te, wa/rai, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Kit/to ki/rei na ni/ji no ha/na ni nat/te sa/ki u/ta/u…! + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Zen/ryo/ku de "hi/to/ri ja nai" to to/do/ke/tai + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Zet/tai ni… zet/tai ni…! \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlower.split.sample b/src/test/resources/out/SymphogearRainbowFlower.split.sample new file mode 100644 index 0000000..02dc91c --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlower.split.sample @@ -0,0 +1,49 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r) + +I/ku/o/ku no re/ki/shi wo ko/e/te +Ko/no mu/ne no (Go) to/i/ka/ke ni (Go) ko/ta/e yo Shi/ne + +Ho/no/u yo/ri a/tsu/i o/mo/i yo +Ko/u/te/tsu no (Go) i/ka/dzu/chi de (Go) bu/t/to/ba/se My Gu/n/gni/r + +Sa/i/so/ku de sa/i/ta/n de i/c/cho/ku/se/n ni +Hi/ka/t/ta (Fly) a/sa/hi wo (Fly) +Ki/mi to to/mo ni mi/ta/i (mi/ta/i) i/ma (i/ma) mi/a/ge/yo/u + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Wa/ra/o/u…! Ko/no se/ka/i ni wa u/ta ga a/ru + +Na/n/do de/mo ta/chi/a/ga/re/ru sa +Cho/t/to da/ke (Go) ki/ta mi/chi wo (Go) mi/te go/ra/n? + +Ko/n/na ni mo ka/ga/ya/i/te i/ru +Tsu/mi/a/ge/ta (Go) mo/no/ga/ta/ri (Go) u/so wa na/ni mo na/i + +"I/tsu/ka mi/ra/i ni hi/to wa tsu/na/ga/re/ru… " +Da/i/ji na (Fly) to/mo ka/ra (Fly) +Mo/ra/t/ta ko/to/ba ze/t/ta/i (ze/t/ta/i) yu/me (yu/me) tsu/mu/gu ka/ra + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ka/i de a/i no ba/n/ka yo to/do/ro/i/te + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Yu/u/ki mo na/ni mo ka/mo wo ze/n/bu ta/ba/ne/yo/u + +(Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n) + +Ki/mi to wa/ta/shi, mi/n/na, mi/n/na +A/yu/mi ki/t/ta, a/shi/a/to ni do/n/na ha/na ga sa/ku no ka/na/a? + +Na/i/te, wa/ra/i, u/ma/re o/chi/ta, na/mi/da, na/mi/da… +Ki/t/to ki/re/i na ni/ji no ha/na ni na/t/te sa/ki u/ta/u…! + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +Ze/n/ryo/ku de "hi/to/ri ja na/i" to to/do/ke/ta/i + +Hi/bi/ke (hi/bi/ke) tsu/ta/e (tsu/ta/e) u/ta/e (u/ta/e) +So/shi/te! Ma/ta a/u so/no hi ma/de e/ga/o no "sa/yo/na/ra" da! +Ze/t/ta/i ni… ze/t/ta/i ni…! \ No newline at end of file From ba5e851239449ac46fc31741614039441aa0798b Mon Sep 17 00:00:00 2001 From: Dysp Date: Sun, 4 Oct 2020 22:07:33 +0200 Subject: [PATCH 08/11] Add kanji samples --- .../resources/in/EvangelionOPFullKanji.sample | 48 +++++++++++++++++++ .../in/SymphogearRainbowFlowerKanji.sample | 48 +++++++++++++++++++ .../out/EvangelionOPFullKanji.split.sample | 48 +++++++++++++++++++ .../SymphogearRainbowFlowerKanji.split.sample | 48 +++++++++++++++++++ 4 files changed, 192 insertions(+) create mode 100644 src/test/resources/in/EvangelionOPFullKanji.sample create mode 100644 src/test/resources/in/SymphogearRainbowFlowerKanji.sample create mode 100644 src/test/resources/out/EvangelionOPFullKanji.split.sample create mode 100644 src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample diff --git a/src/test/resources/in/EvangelionOPFullKanji.sample b/src/test/resources/in/EvangelionOPFullKanji.sample new file mode 100644 index 0000000..1e45243 --- /dev/null +++ b/src/test/resources/in/EvangelionOPFullKanji.sample @@ -0,0 +1,48 @@ +残酷な天使のように +少年よ 神話になれ +蒼い風がいま +胸のドアを叩いても +私だけをただ見つめて +微笑んでるあなた +そっとふれるもの +もとめることに夢中で +運命さえまだ知らない +いたいけな瞳 +だけどいつか気付くでしょう +その背中には +遥か未来 めざすための +羽根があること +残酷な天使のテーゼ +窓辺からやがて飛び立つ +ほとばしる熱いパトスで +思い出を裏切るなら +この宇宙(そら)を抱いて輝く +少年よ 神話になれ +ずっと眠ってる +私の愛の揺りかご +あなただけが 夢の使者に +呼ばれる朝がくる +細い首筋を +月あかりが映してる +世界中の時を止めて +閉じこめたいけど +もしもふたり逢えたことに +意味があるなら +私はそう 自由を知る +ためのバイブル +残酷な天使のテーゼ +悲しみがそしてはじまる +抱きしめた命のかたち +その夢に目覚めたとき +誰よりも光を放つ +少年よ 神話になれ +人は愛をつむぎながら +歴史をつくる +女神なんてなれないまま +私は生きる +残酷な天使のテーゼ +窓辺からやがて飛び立つ +ほとばしる熱いパトスで +思い出を裏切るなら +この宇宙(そら)を抱いて輝く +少年よ 神話になれ \ No newline at end of file diff --git a/src/test/resources/in/SymphogearRainbowFlowerKanji.sample b/src/test/resources/in/SymphogearRainbowFlowerKanji.sample new file mode 100644 index 0000000..e14f715 --- /dev/null +++ b/src/test/resources/in/SymphogearRainbowFlowerKanji.sample @@ -0,0 +1,48 @@ +(Ye-e-Ye-e Ha-a Kort gungnir messa baggy) +(Ye-e-Ye-e Ha-a Kort gungnir messa brossy…Gungnir) + +幾億の歴史を超えて +この胸の (Go) 問いかけに (Go) 応えよShine + +焔より熱い想いよ +鋼鉄の (Go) イカヅチで (Go) ぶっ飛ばせMy Gungnir + +最速で最短で一直線に +光った (Fly) 朝日を (Fly) +君と共に 見たい (見たい) 今 (今) 見上げよう + +響け (響け) 伝え (伝え) 歌え (歌え) +全力で 「一人じゃない」と届けたい + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! 笑おう…! この世界には 歌がある + +何度でも立ち上がれるさ +ちょっとだけ (Go) 来た道を (Go) 見てごらん? + +こんなにも輝いている +積み上げた (Go) 物語 (Go) 嘘は何もない + +「いつか未来に人は繋がれる…」 +大事な (Fly) 友から (Fly) +貰った言葉 絶対 (絶対) 夢 (夢) 紡ぐから + +響け (響け) 伝え (伝え) 歌え (歌え) +全開で 愛の挽歌よ轟いて + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! 勇気も何もかもを 全部束ねよう + +(Balwisyall nescell gungnir tron) + +君と私、みんな、みんな +歩みきった、足跡に どんな花が咲くのかなぁ? +泣いて、笑い、生まれ落ちた、涙、なみだ… +きっと 綺麗な虹の花になって 咲き歌う…! + +響け (響け) 伝え (伝え) 歌え (歌え) +全力で 「一人じゃない」と届けたい + +響け (響け) 伝え (伝え) 歌え (歌え) +そしてッ! また会うその日まで笑顔の 「サヨナラ」だ! +絶対に…絶対に…ッ! \ No newline at end of file diff --git a/src/test/resources/out/EvangelionOPFullKanji.split.sample b/src/test/resources/out/EvangelionOPFullKanji.split.sample new file mode 100644 index 0000000..f67149d --- /dev/null +++ b/src/test/resources/out/EvangelionOPFullKanji.split.sample @@ -0,0 +1,48 @@ +残/酷/な/天/使/の/よ/う/に +少/年/よ 神/話/に/な/れ +蒼/い/風/が/い/ま +胸/の/ド/ア/を/叩/い/て/も +私/だ/け/を/た/だ/見/つ/め/て +微/笑/ん/で/る/あ/な/た +そ/っと/ふ/れ/る/も/の +も/と/め/る/こ/と/に/夢/中/で +運/命/さ/え/ま/だ/知/ら/な/い +い/た/い/け/な/瞳 +だ/け/ど/い/つ/か/気/付/く/で/しょ/う +そ/の/背/中/に/は +遥/か/未/来 め/ざ/す/た/め/の +羽/根/が/あ/る/こ/と +残/酷/な/天/使/の/テー/ゼ +窓/辺/か/ら/や/が/て/飛/び/立/つ +ほ/と/ば/し/る/熱/い/パ/ト/ス/で +思/い/出/を/裏/切/る/な/ら +こ/の/宇/宙(そ/ら)を/抱/い/て/輝/く +少/年/よ 神/話/に/な/れ +ず/っと/眠/って/る +私/の/愛/の/揺/り/か/ご +あ/な/た/だ/け/が 夢/の/使/者/に +呼/ば/れ/る/朝/が/く/る +細/い/首/筋/を +月/あ/か/り/が/映/し/て/る +世/界/中/の/時/を/止/め/て +閉/じ/こ/め/た/い/け/ど +も/し/も/ふ/た/り/逢/え/た/こ/と/に +意/味/が/あ/る/な/ら +私/は/そ/う 自/由/を/知/る +た/め/の/バ/イ/ブ/ル +残/酷/な/天/使/の/テー/ゼ +悲/し/み/が/そ/し/て/は/じ/ま/る +抱/き/し/め/た/命/の/か/た/ち +そ/の/夢/に/目/覚/め/た/と/き +誰/よ/り/も/光/を/放/つ +少/年/よ 神/話/に/な/れ +人/は/愛/を/つ/む/ぎ/な/が/ら +歴/史/を/つ/く/る +女/神/な/ん/て/な/れ/な/い/ま/ま +私/は/生/き/る +残/酷/な/天/使/の/テー/ゼ +窓/辺/か/ら/や/が/て/飛/び/立/つ +ほ/と/ば/し/る/熱/い/パ/ト/ス/で +思/い/出/を/裏/切/る/な/ら +こ/の/宇/宙(そ/ら)を/抱/い/て/輝/く +少/年/よ 神/話/に/な/れ \ No newline at end of file diff --git a/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample b/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample new file mode 100644 index 0000000..d224338 --- /dev/null +++ b/src/test/resources/out/SymphogearRainbowFlowerKanji.split.sample @@ -0,0 +1,48 @@ +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa ba/g/gy) +(Ye-/e-/Ye-/e Ha-/a Ko/rt gu/n/gni/r me/s/sa bro/s/sy… Gu/n/gni/r) + +幾/億/の/歴/史/を/超/え/て +こ/の/胸/の (Go) 問/い/か/け/に (Go) 応/え/よ/Shi/ne + +焔/よ/り/熱/い/想/い/よ +鋼/鉄/の (Go) イ/カ/ヅ/チ/で (Go) ぶ/っ/飛/ば/せ/My Gu/n/gni/r + +最/速/で/最/短/で/一/直/線/に +光/った (Fly) 朝/日/を (Fly) +君/と/共/に 見/た/い (見/た/い) 今 (今) 見/上/げ/よ/う + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/力/で 「一/人/じゃ/な/い」と/届/け/た/い + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! 笑/お/う…! こ/の/世/界/に/は 歌/が/あ/る + +何/度/で/も/立/ち/上/が/れ/る/さ +ちょ/っと/だ/け (Go) 来/た/道/を (Go) 見/て/ご/ら/ん? + +こ/ん/な/に/も/輝/い/て/い/る +積/み/上/げ/た (Go) 物/語 (Go) 嘘/は/何/も/な/い + +「い/つ/か/未/来/に/人/は/繋/が/れ/る… 」 +大/事/な (Fly) 友/か/ら (Fly) +貰/った/言/葉 絶/対 (絶/対) 夢 (夢) 紡/ぐ/か/ら + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/開/で 愛/の/挽/歌/よ/轟/い/て + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! 勇/気/も/何/も/か/も/を 全/部/束/ね/よ/う + +(Ba/lwi/sya/l/l ne/sce/l/l gu/n/gni/r tro/n) + +君/と/私、/み/ん/な、/み/ん/な +歩/み/き/った、/足/跡/に ど/ん/な/花/が/咲/く/の/か/な/ぁ? +泣/い/て、/笑/い、/生/ま/れ/落/ち/た、/涙、/な/み/だ… +き/っと 綺/麗/な/虹/の/花/に/な/って 咲/き/歌/う…! + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +全/力/で 「一/人/じゃ/な/い」と/届/け/た/い + +響/け (響/け) 伝/え (伝/え) 歌/え (歌/え) +そ/し/て/ッ! ま/た/会/う/そ/の/日/ま/で/笑/顔/の 「サ/ヨ/ナ/ラ」だ! +絶/対/に… 絶/対/に… ッ! \ No newline at end of file From 1e0d84a9bf401f78af3240bd32f2a66952098472 Mon Sep 17 00:00:00 2001 From: NyorJa Date: Tue, 13 Oct 2020 22:09:46 +0800 Subject: [PATCH 09/11] Add unit test --- .gitignore | 1 + build.gradle | 15 ++++++++ .../fr/enssat/dysp/lyrics/TraitementTest.java | 35 +++++++++++++++++++ src/test/resources/lyrics.txt | 26 ++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java create mode 100644 src/test/resources/lyrics.txt diff --git a/.gitignore b/.gitignore index b2040dc..74ecff0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ bin/main/fr/enssat/dysp/lyrics/Traitement$CharType.class .settings/org.eclipse.buildship.core.prefs .project .classpath +.idea diff --git a/build.gradle b/build.gradle index d47fc2a..6117d97 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ plugins { // Apply the application plugin to add support for building a CLI application. id 'application' + id 'jacoco' } compileJava { @@ -20,6 +21,19 @@ compileJava { targetCompatibility = '1.8' } + +jacoco { + toolVersion = "0.8.5" + reportsDir = file("$buildDir/jacoco") +} + +test { + finalizedBy jacocoTestReport +} +jacocoTestReport { + dependsOn test +} + repositories { // Use jcenter for resolving dependencies. // You can declare any Maven/Ivy/file repository here. @@ -28,6 +42,7 @@ repositories { dependencies { // standalone + testCompile 'junit:junit:4.12' } application { diff --git a/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java b/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java new file mode 100644 index 0000000..034022d --- /dev/null +++ b/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java @@ -0,0 +1,35 @@ +package fr.enssat.dysp.lyrics; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class TraitementTest { + + @Before + public void setUp() { + Traitement.init(); + } + + @Test + public void testInit() { + Assert.assertEquals("SAMPLE", Traitement.optimize("SAMPLE")); + } + + @Test + public void testTraiter() { + String lyrics = "hello, again its you and me! 123 go! abc@abc.com:)♡っョ わたしはにほんへいきます ロシア 语大字典"; + String actual = Traitement.traiter(lyrics); + Assert.assertTrue(actual.contains("/")); + + } + + @Test + public void testSplitThatShit() { + String text = "split that shit"; + String actual = Traitement.splitThatShit(text); + + Assert.assertEquals(text, actual); + } + +} diff --git a/src/test/resources/lyrics.txt b/src/test/resources/lyrics.txt new file mode 100644 index 0000000..0949b2e --- /dev/null +++ b/src/test/resources/lyrics.txt @@ -0,0 +1,26 @@ +Pista sa amo +Ako nangimbitar. +Mikalit kadaghang bisita +Ug wa jud ko magdahum... +Naratol si mama +Kay nahutdag gamit sa kusina +Maong ako nalang +Nangita ug paagi... +Maong gi-fingers, gi-fingers nalang +Kay wa nay kutsarag tinidor sa lamisa +Maong gi-fingers, gi-fingers nalang +Kay akong amigo gigutom na... +Ako gayud nauwaw, +Di na ko halos mutan-aw +Maayo nalang ang +Akong amigo mi-ingon... +"Kinawboy lang ta bai" +Yeah funny it seems +We got a bunny on the table +Light up the stage +As we hook up on the cable +We party, we're hungry, we're going to the fiesta... yeah!!! +But we've got no spoon, we've got no fork... +We barely got nothing to pick up the pork +And so we fingers, oh yeah we fingers!! +"La mo gid gikamot, unsa day buti pa sabut!" \ No newline at end of file From 6a95e41f23730b8a28517d761488341631169fea Mon Sep 17 00:00:00 2001 From: NyorJa Date: Wed, 14 Oct 2020 00:51:49 +0800 Subject: [PATCH 10/11] Remove unnecessary resource --- src/test/resources/lyrics.txt | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/test/resources/lyrics.txt diff --git a/src/test/resources/lyrics.txt b/src/test/resources/lyrics.txt deleted file mode 100644 index 0949b2e..0000000 --- a/src/test/resources/lyrics.txt +++ /dev/null @@ -1,26 +0,0 @@ -Pista sa amo -Ako nangimbitar. -Mikalit kadaghang bisita -Ug wa jud ko magdahum... -Naratol si mama -Kay nahutdag gamit sa kusina -Maong ako nalang -Nangita ug paagi... -Maong gi-fingers, gi-fingers nalang -Kay wa nay kutsarag tinidor sa lamisa -Maong gi-fingers, gi-fingers nalang -Kay akong amigo gigutom na... -Ako gayud nauwaw, -Di na ko halos mutan-aw -Maayo nalang ang -Akong amigo mi-ingon... -"Kinawboy lang ta bai" -Yeah funny it seems -We got a bunny on the table -Light up the stage -As we hook up on the cable -We party, we're hungry, we're going to the fiesta... yeah!!! -But we've got no spoon, we've got no fork... -We barely got nothing to pick up the pork -And so we fingers, oh yeah we fingers!! -"La mo gid gikamot, unsa day buti pa sabut!" \ No newline at end of file From 2d64dae2e5bfe66f239f3d9d9333cc1bc2dd122f Mon Sep 17 00:00:00 2001 From: NyorJa Date: Wed, 21 Oct 2020 22:42:22 +0800 Subject: [PATCH 11/11] more test --- build.gradle | 11 +++ .../fr/enssat/dysp/lyrics/TraitementTest.java | 74 +++++++++++++++---- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 6117d97..5d56636 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,9 @@ compileJava { targetCompatibility = '1.8' } +dependencies { + compile group: 'commons-io', name: 'commons-io', version: '2.6' +} jacoco { toolVersion = "0.8.5" @@ -29,7 +32,15 @@ jacoco { test { finalizedBy jacocoTestReport + systemProperty "file.encoding", "UTF-8" +} +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" } +tasks.withType(Test) { + systemProperty "file.encoding", "UTF-8" +} + jacocoTestReport { dependsOn test } diff --git a/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java b/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java index 034022d..acb5fc8 100644 --- a/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java +++ b/src/test/java/fr/enssat/dysp/lyrics/TraitementTest.java @@ -1,35 +1,81 @@ package fr.enssat.dysp.lyrics; -import org.junit.Assert; -import org.junit.Before; +import org.apache.commons.io.IOUtils; +import org.junit.BeforeClass; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +import static org.junit.Assert.assertEquals; + public class TraitementTest { - @Before - public void setUp() { + @BeforeClass + public static void setUp() { Traitement.init(); } @Test - public void testInit() { - Assert.assertEquals("SAMPLE", Traitement.optimize("SAMPLE")); + public void testTraiter_EvangelionSplitFullKanji() { + + String inputContent = extractFromResource("in/EvangelionOPFullKanji.sample"); + String expectedContent = extractFromResource("out/EvangelionOPFullKanji.split.sample"); + + String actual = Traitement.traiter(inputContent); + + assertEquals(actual, expectedContent); + } @Test - public void testTraiter() { - String lyrics = "hello, again its you and me! 123 go! abc@abc.com:)♡っョ わたしはにほんへいきます ロシア 语大字典"; - String actual = Traitement.traiter(lyrics); - Assert.assertTrue(actual.contains("/")); + public void testTraiter_EvangelionSplitFullRomaji() { + String inputContent = extractFromResource("in/EvangelionOPFullRomaji.sample"); + String expectedContent = extractFromResource("out/EvangelionOPFullRomaji.split.sample"); + + String actual = Traitement.traiter(inputContent); + + assertEquals(actual, expectedContent); + } + + @Test + public void testTraiter_WhenBlankInput_ReturnEmptyString() { + assertEquals("", Traitement.traiter(null)); } @Test - public void testSplitThatShit() { - String text = "split that shit"; - String actual = Traitement.splitThatShit(text); + public void testTraiter_EvangelionRomajiSplitOptimizeAndSplitThatShit() { + + String inputContent = extractFromResource("in/EvangelionOPFullRomaji.sample"); + + String trait = Traitement.traiter(inputContent); + + String expectedContent = extractFromResource("out/EvangelionOPFullRomaji.split.optimize.sample"); + String expectedSplitThatShit = extractFromResource("out/EvangelionOPFullRomaji.split.optimize.chorus.sample"); + + String actualOptimize = Traitement.optimize(trait); + + assertEquals(actualOptimize, expectedContent); + + String splitThatShitActual = Traitement.splitThatShit(actualOptimize); + + assertEquals(splitThatShitActual, expectedSplitThatShit); + + } + + private String extractFromResource(String directory) { + ClassLoader classLoader = getClass().getClassLoader(); + String content = ""; + try (InputStream inputStream = classLoader.getResourceAsStream(directory)) { + + content = IOUtils.toString(inputStream, StandardCharsets.UTF_8); - Assert.assertEquals(text, actual); + } catch (IOException e) { + e.printStackTrace(); + } + return content; } }