Skip to content

Merge pull request #19 from python-am-cp/master #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PapernyukAlex wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Merge pull request #19 from python-am-cp/master #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
413f035
Merge pull request #19 from python-am-cp/master
sabal202 Apr 11, 2019
f65bb13
Ugug
SokovIlyaArchiv Apr 11, 2019
3849abe
Merge branch 'develop' into newalgo
SokovIlyaArchiv Apr 11, 2019
c16dbdd
Some fixes. Deep testing modification. F1: 0.428
SokovIlyaArchiv Apr 12, 2019
47076e1
getValueByQuant chance changed
iluha1337 Apr 12, 2019
fe0ae25
Params changed, trash files removed
SokovIlyaArchiv Apr 12, 2019
3506d58
Merge pull request #25 from python-am-cp/newalgo
sabal202 Apr 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/menu_tagged.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ good_id,good,first_course,main_course,drink,bakery,dessert,snacks,salad,meat&fis
85,Пирожок Сосиска в тесте,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0
86,Картофель по-деревенски 150гр,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0
87,Свиная отбивная 80/20гр,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
88,Пирог Осетинский/мясо 1кусок,0,1,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0
88,Пирог Осетинский/мясо 1кусок,0,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0
89,Котлета куриная б/п 100гр,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
90,Щи из кваш.кап/картофель 250гр,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0
91,Суп Лигурийский побережный/рыб 250гр,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0
Expand Down Expand Up @@ -226,7 +226,7 @@ good_id,good,first_course,main_course,drink,bakery,dessert,snacks,salad,meat&fis
224,С-т Чука/с.ореховый 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
225,Свинина/с.тар-тар 80/20гр,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0
226,С-т Чука/горбуша 120гр,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0
227,Пирог Осетинский/сыр 1кусок,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0
227,Пирог Осетинский/сыр 1кусок,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0
228,Хашбрауны 2шт/100гр,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
229,Свекла запеч/брусника 120гр,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
230,Баклажаны/кабачки/с.йогурт/мята 120гр,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0
Expand Down Expand Up @@ -257,20 +257,20 @@ good_id,good,first_course,main_course,drink,bakery,dessert,snacks,salad,meat&fis
255,С-т Баварский/красн.капуста 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0
256,С-т айсберг/хурма/перепелиное яйцо 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0
257,Говядина по-сельски 80гр,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
258,Пирог Осетинский/капустой 1кусок,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0
258,Пирог Осетинский/капустой 1кусок,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0
259,Булгур/томаты/кабачки 120гр,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0
260,Индейка/вяленые томаты 80гр,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0
261,Пирожок Слойка/картоф/грибы,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,1,1,0,0,0,0,0,1,0,0
262,Капуста туш/помидор 150гр,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0
263,Кур.окорочка отварные 125гр,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
264,Ланч бокс большой 1шт,0,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
264,Ланч бокс большой 1шт,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
265,С-т из помидор/кр.лук/кинза 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0
266,С-т из тыквы/изюм 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
267,С-т из помидор/редис/масло 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
268,С-т из дайкон/мяса 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0
269,С-т айсберг/моцарелла/заправка 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0
270,Индейка филе копченая 100гр,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
271,Пирог Осетинский/картоф/грибы 1кусок,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0
271,Пирог Осетинский/картоф/грибы 1кусок,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0
272,С-т из белых бобов/перец/с.зеленый 120гр,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0
273,Буженина копченая 100гр,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
274,Фасоль черная/фета 120гр,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0
Expand Down Expand Up @@ -437,7 +437,7 @@ good_id,good,first_course,main_course,drink,bakery,dessert,snacks,salad,meat&fis
435,Борщ Сибирский/мясо 250гр,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0
436,Рыба жар/яйцо/кунжут/с.терияки 120/20/10,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0
437,Лимонад грушевый 200гр,0,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0
438,Пирог Осетинский/картоф/щавель 1кусок,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0
438,Пирог Осетинский/картоф/щавель 1кусок,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0
439,Свиная отбивная/с.барбекю 80/15гр,0,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0
440,Борщ Кубанский/овощной 250гр,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0
441,Детокс вода/клубника 200гр,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0
Expand Down
Loading