diff --git a/trailminator/nlu.py b/trailminator/nlu.py index a293857..e6be84f 100644 --- a/trailminator/nlu.py +++ b/trailminator/nlu.py @@ -58,4 +58,10 @@ class Nlu: return (act, param) nlu = Nlu() -print(nlu.tokenize('chciałbym kupić bilet do Krakow')) \ No newline at end of file +print(nlu.tokenize('chciałbym kupić bilet do Krakow')) +print(nlu.tokenize('chciałbym kupić bilet z Poznan')) +print(nlu.tokenize('w piątek')) +print(nlu.tokenize('4 bilety')) +print(nlu.tokenize('2 bilety z ulgą studencką')) +print(nlu.tokenize('miejsce pod oknem')) +print(nlu.tokenize('druga klasa')) \ No newline at end of file diff --git a/trailminator/rules.jsgf b/trailminator/rules.jsgf index 9f7bf47..ad48d0f 100644 --- a/trailminator/rules.jsgf +++ b/trailminator/rules.jsgf @@ -20,14 +20,14 @@ public = (+){number}; public = []{passangerCount} bilet[y | ów]; //discount count -public = []{discountedCount} bilet[y] z ulgą {discount_type}; +public = []{discountedCount} bilet[y] (z ulgą | ze zniżką) {discount_type}; = studencką | seniorską | uczniowską; //seatType -public = [poproszę] {seatType} | {seatType}; +public = [poproszę] ({seatType} | {seatType}); = [miejsce] pod oknem; = [miejsce] w środku | [miejsce] w przejściu; //wagonType -public = [klasy | klasa] {wagonType}; +public = [klasy | klasa] {wagonType} [klasy | klasa]; = pierwsza | druga | 1 | 2 | I | II; \ No newline at end of file