From 642174f2606ee57a7bd6842708c591aed278461f Mon Sep 17 00:00:00 2001 From: Eryk Miszczuk Date: Wed, 22 Jan 2020 14:40:25 +0100 Subject: [PATCH] Removed bug from python code, because local versions uses Python 2 and for test Python 3 is used --- TaskB05/run.py | 2 +- TaskX07/Makefile | 9 -------- TaskX07/legiatolech.grm | 47 +++-------------------------------------- TaskX07/run | 2 +- 4 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 TaskX07/Makefile diff --git a/TaskB05/run.py b/TaskB05/run.py index 0946c9b..422a5f6 100644 --- a/TaskB05/run.py +++ b/TaskB05/run.py @@ -48,7 +48,7 @@ for line in sys.stdin: move = atandt_desc_pattern.match(line) succes = atandt_accepted_state_pattern.match(line) if move: - node = str(move.group(3)).decode('utf-8') + node = str(move.group(3)) state_move.add((int(move.group(1)), node, int(move.group(2)))) if succes: accept_states.add(int(line)) diff --git a/TaskX07/Makefile b/TaskX07/Makefile deleted file mode 100644 index 1c31acb..0000000 --- a/TaskX07/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -# .far to specjalny format do przechowywania spakowanych transduktorów - -BINARIES += TaskX07/legiatolech.far - -TaskX07/run: TaskX07/legiatolech.far - -TaskX07/legiatolech.far: TaskX07/legiatolech.grm - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/fst" thraxcompiler --input_grammar=$< --output_far=$@ diff --git a/TaskX07/legiatolech.grm b/TaskX07/legiatolech.grm index 48bbbf3..b109c99 100644 --- a/TaskX07/legiatolech.grm +++ b/TaskX07/legiatolech.grm @@ -1,45 +1,4 @@ - -# zamiana końcówek, "i"/"ę" zgrupowane, bo zamieniamy na wspólną końcówkę -suffixes = ("a" : "") | ("i" | "ę" : "a") | ("ą" : "em"); - -# zamiana rdzenia -legia_to_lech_core = "Legi" : "Lech"; - -legia_to_lech = legia_to_lech_core suffixes; - -# Wszystkie możliwe znaki, niestety nie ma (?) prostszego sposobu. -# Zauważmy, że polskie znaki diakrytyczne będą reprezentowane -# tak naprawdę jako dwuznaki, nie stanowi to jednak problemu. -allChars = Optimize[ - "[1]" | "[2]" | "[3]" | "[4]" | "[5]" | "[6]" | "[7]" | "[8]" | "[9]" | "[10]" | - "[11]" | "[12]" | "[13]" | "[14]" | "[15]" | "[16]" | "[17]" | "[18]" | "[19]" | "[20]" | - "[21]" | "[22]" | "[23]" | "[24]" | "[25]" | "[26]" | "[27]" | "[28]" | "[29]" | "[30]" | - "[31]" | "[32]" | "[33]" | "[34]" | "[35]" | "[36]" | "[37]" | "[38]" | "[39]" | "[40]" | - "[41]" | "[42]" | "[43]" | "[44]" | "[45]" | "[46]" | "[47]" | "[48]" | "[49]" | "[50]" | - "[51]" | "[52]" | "[53]" | "[54]" | "[55]" | "[56]" | "[57]" | "[58]" | "[59]" | "[60]" | - "[61]" | "[62]" | "[63]" | "[64]" | "[65]" | "[66]" | "[67]" | "[68]" | "[69]" | "[70]" | - "[71]" | "[72]" | "[73]" | "[74]" | "[75]" | "[76]" | "[77]" | "[78]" | "[79]" | "[80]" | - "[81]" | "[82]" | "[83]" | "[84]" | "[85]" | "[86]" | "[87]" | "[88]" | "[89]" | "[90]" | - "[91]" | "[92]" | "[93]" | "[94]" | "[95]" | "[96]" | "[97]" | "[98]" | "[99]" | "[100]" | -"[101]" | "[102]" | "[103]" | "[104]" | "[105]" | "[106]" | "[107]" | "[108]" | "[109]" | "[110]" | -"[111]" | "[112]" | "[113]" | "[114]" | "[115]" | "[116]" | "[117]" | "[118]" | "[119]" | "[120]" | -"[121]" | "[122]" | "[123]" | "[124]" | "[125]" | "[126]" | "[127]" | "[128]" | "[129]" | "[130]" | -"[131]" | "[132]" | "[133]" | "[134]" | "[135]" | "[136]" | "[137]" | "[138]" | "[139]" | "[140]" | -"[141]" | "[142]" | "[143]" | "[144]" | "[145]" | "[146]" | "[147]" | "[148]" | "[149]" | "[150]" | -"[151]" | "[152]" | "[153]" | "[154]" | "[155]" | "[156]" | "[157]" | "[158]" | "[159]" | "[160]" | -"[161]" | "[162]" | "[163]" | "[164]" | "[165]" | "[166]" | "[167]" | "[168]" | "[169]" | "[170]" | -"[171]" | "[172]" | "[173]" | "[174]" | "[175]" | "[176]" | "[177]" | "[178]" | "[179]" | "[180]" | -"[181]" | "[182]" | "[183]" | "[184]" | "[185]" | "[186]" | "[187]" | "[188]" | "[189]" | "[190]" | -"[191]" | "[192]" | "[193]" | "[194]" | "[195]" | "[196]" | "[197]" | "[198]" | "[199]" | "[200]" | -"[201]" | "[202]" | "[203]" | "[204]" | "[205]" | "[206]" | "[207]" | "[208]" | "[209]" | "[210]" | -"[211]" | "[212]" | "[213]" | "[214]" | "[215]" | "[216]" | "[217]" | "[218]" | "[219]" | "[220]" | -"[221]" | "[222]" | "[223]" | "[224]" | "[225]" | "[226]" | "[227]" | "[228]" | "[229]" | "[230]" | -"[231]" | "[232]" | "[233]" | "[234]" | "[235]" | "[236]" | "[237]" | "[238]" | "[239]" | "[240]" | -"[241]" | "[242]" | "[243]" | "[244]" | "[245]" | "[246]" | "[247]" | "[248]" | "[249]" | "[250]" | -"[251]" | "[252]" | "[253]" | "[254]" | "[255]" -]; - -add_four_digit = ("0":"4") | ("1":"5") | ("2":"6") | ("3":"7") | ("4":"8") | ("5":"9") | ("6":"S0") | ("7":"S1") | ("8":"S2") | ("9":"3C"); +add_four_digit = ("0":"4") | ("1":"5") | ("2":"6") | ("3":"7") | ("4":"8") | ("5":"9") | ("6":"01") | ("7":"11") | ("8":"21") | ("9":"31"); add_one_digit = ("C0":"1") | ("C1":"2") | ("C2":"3") | ("C3":"4") | ("C4":"5") | ("C5":"6") | ("C6":"7") | ("C7":"8") | ("C8":"9") | ("C9":"0C"); @@ -49,8 +8,8 @@ number = digit+; add_four = add_four_digit number?; -#handle_carry = (number? (("S0":"0C") | ("S1":"1C") | ("S2":"2C") | ("S3":"3C")) number?) | number; +handle_carry = (number? (("S0":"0") | ("S1":"1") | ("S2":"2") | ("S3":"3")) number?) | number; -handle_carry = (number? (("S0":"0C") | ("S1":"1C") | ("S2":"2C") | ("S3":"3C")) number?) | (number? (("C0":"1") | ("C1":"2") | ("C2":"3") | ("C3":"4") | ("C4":"5") | ("C5":"6") | ("C6":"7") | ("C7":"8") | ("C8":"9") | ("C9":"0C")) number?) | (number? ("C":"1")) | number; +#handle_carry = (number? (("S0":"0C") | ("S1":"1C") | ("S2":"2C") | ("S3":"3C")) number?) | (number? (("C0":"1") | ("C1":"2") | ("C2":"3") | ("C3":"4") | ("C4":"5") | ("C5":"6") | ("C6":"7") | ("C7":"8") | ("C8":"9") | ("C9":"0C")) number?) | (number? ("C":"1")) | number; export PROCESS = Optimize[Reverse[add_four @ handle_carry]]; diff --git a/TaskX07/run b/TaskX07/run index 96b1df6..5a5b47b 100644 --- a/TaskX07/run +++ b/TaskX07/run @@ -1,3 +1,3 @@ #!/bin/bash -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/fst" thraxrewrite-tester --far=TaskX05/legiatolech.far --rules=PROCESS +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/fst" thraxrewrite-tester --far=TaskX07/legiatolech.far --rules=PROCESS