working version that was presented

 Conflicts:

	.idea/ProjektAI.iml

	.idea/misc.xml

	kelner/src/managers/WaiterManager.py

.gitignore

@@ -1,8 +1,3 @@
-
-# Created by https://www.gitignore.io/api/python
-# Edit at https://www.gitignore.io/?templates=python
-
-### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -25,13 +20,10 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-
-/idea/workspace.xml
 MANIFEST
 
 # PyInstaller
@@ -54,26 +46,31 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
-.idea
+cover/
-.idea/*
 
 # Translations
 *.mo
 *.pot
 
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
-.python-version
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -82,12 +79,25 @@ target/
 #   install all needed dependencies.
 #Pipfile.lock
 
-# celery beat schedule file
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
 
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -95,11 +105,6 @@ celerybeat-schedule
 # Rope project settings
 .ropeproject
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
 # mkdocs documentation
 /site
 
@@ -111,4 +116,8 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# End of https://www.gitignore.io/api/python
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/ProjektAI.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.7 (ProjektAI)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (ProjektAI)" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ProjektAI.iml" filepath="$PROJECT_DIR$/.idea/ProjektAI.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

README.md

@@ -0,0 +1,26 @@
+## Table of contents
+* [General info](#general-info)
+* [Technologies](#technologies)
+* [Setup](#setup)
+
+## General info
+This is AI project of autonomic waiter that recognizes images of placed ordes with CNN algorithm. Orders are generated using the decision tree algoritm while tables by generic algorithm.
+
+Table of contents
+* [General info](#general-info)
+* [Technologies](#technologies)
+* [Setup](#setup)
+
+## Technologies
+Project is created with:
+* Python 64-bit: 3.6
+* Tensorflow: 2.0.0
+	
+## Setup
+The `requirements.txt` file should list all Python libraries that your notebooks
+depend on, and they will be installed using:
+
+```
+pip install -r requirements.txt
+```
+

kelner/.idea/workspace.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="4be2149b-d9bc-4e21-8365-293320ae7f92" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Python Script" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectId" id="1ZSC25l5bE6jvUIMcW31QzsqTTN" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="settings.github" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="J:\PycharmProjects\kelner\src\components" />
-      <recent name="J:\PycharmProjects\kelner\images" />
-      <recent name="J:\PycharmProjects\kelner" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
-      <module name="kelner" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Python.main" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="4be2149b-d9bc-4e21-8365-293320ae7f92" name="Default Changelist" comment="" />
-      <created>1584822897275</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1584822897275</updated>
-      <workItem from="1584822899496" duration="10270000" />
-      <workItem from="1584835781926" duration="189000" />
-      <workItem from="1584889217128" duration="20738000" />
-    </task>
-    <task id="LOCAL-00001" summary="klasa kelner">
-      <created>1584889744892</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1584889744892</updated>
-    </task>
-    <task id="LOCAL-00002" summary="klasa kelner">
-      <created>1584910332507</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1584910332507</updated>
-    </task>
-    <option name="localTasksCounter" value="3" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="klasa kelner" />
-    <option name="LAST_COMMIT_MESSAGE" value="klasa kelner" />
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/kelner$main.coverage" NAME="main Coverage Results" MODIFIED="1584910144126" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-  </component>
-</project>

kelner/gui/GAdialog/GADefaults.py

@@ -0,0 +1,104 @@
+
+class CrossingOverMethod:
+    FixedQuadrant = 0
+    SingleHorizontalDiv = 1
+    SingleVerticalDiv = 2
+    DoubleHorizontalDiv = 3
+    DoubleVerticalDiv = 4
+    RandomChoice = 5
+
+
+class SelectionMethod:
+    Roulette = 0
+    Tournament = 1
+
+
+class MutationMethod:
+    Flip = 0
+    Swap = 1
+
+
+class GADefaults:
+
+    def __init__(self):
+
+        self.defSelectionMethods = [("ruletka", SelectionMethod.Roulette),
+                                    ("turniej", SelectionMethod.Tournament)]
+
+        self.defCrossingOverMethods = [("pojedynczy poziomy", CrossingOverMethod.SingleHorizontalDiv),
+                                       ("pojedynczy pionowy", CrossingOverMethod.SingleVerticalDiv),
+                                       ("podwójny poziomy", CrossingOverMethod.DoubleHorizontalDiv),
+                                       ("podwójny pionowy", CrossingOverMethod.DoubleVerticalDiv),
+                                       ("ćwiartki", CrossingOverMethod.FixedQuadrant),
+                                       ("losowe", CrossingOverMethod.RandomChoice)]
+
+        self.defMutationMethods = [("inwersja", MutationMethod.Flip),
+                                   ("wymiana", MutationMethod.Swap)]
+
+        self.windowName = "Algorytm genetyczny - parametry"
+        self.windowGeometry = "400x400"
+        
+        self.minTablesCount = 1
+        self.maxTablesCount = 100
+        self.defTablesCount = 20
+        self.runTablesCount = self.defTablesCount
+        self.sliderNameTablesCount = "stoliki"
+        
+        self.minPopulationSize = 4
+        self.maxPopulationSize = 30
+        self.defPopulationSize = 5
+        self.runPopulationSize = self.defPopulationSize
+        self.sliderNamePopulationSize = "populacja"
+        
+        self.minMutation = 0
+        self.maxMutation = 10
+        self.defMutation = 1
+        self.runMutation = self.defMutation
+        self.sliderNameMutation = "mutacje"
+        
+        self.minGenerationsNumber = 1
+        self.maxGenerationsNumber = 1000
+        self.defGenerationsNumber = 20
+        self.runGenerationsNumber = self.defGenerationsNumber
+        self.sliderNameGenerationsNumber = "pokolenia"
+
+        self.defInfoFold = 5
+        self.runInfoFold = self.defInfoFold
+        self.sliderInfoFold = "co ile"
+
+        self.defSelectionMethod = SelectionMethod.Tournament
+        self.runSelectionMethod = self.defSelectionMethod
+        self.radioSelectionMethodName = "metoda selekcji"
+
+        self.defCrossingOverMethod = CrossingOverMethod.SingleHorizontalDiv
+        self.runCrossingOverMethod = self.defCrossingOverMethod
+        self.radioCrossingOverMethodName = "metoda krzyżowania"
+
+        self.defMutationMethod = MutationMethod.Swap
+        self.runMutationMethod = self.defMutationMethod
+        self.radioMutationMethodName = "metoda mutacji"
+
+        self.minElitism = 0
+        self.maxElitism = 50
+        self.defElitism = 0
+        self.runElitism = self.defElitism
+        self.sliderElitismName = "elitarność [%]"
+
+        self.buttonStartName = "generuj"
+        self.buttonDefaultsName = "przywróć"
+
+        self.__forbiddenPlaces = None
+
+        self.waiterPosition = None
+        self.kitchenPosition = None
+
+    def getForbiddenPlaces(self):
+        if self.__forbiddenPlaces is None:
+            self.__forbiddenPlaces = [self.waiterPosition, self.kitchenPosition]
+        return self.__forbiddenPlaces
+
+    def getInfo(self):
+        return "populacja: " + str(self.runPopulationSize) \
+            + ", pokolenia: " + str(self.runGenerationsNumber) \
+            + ", stoliki: " + str(self.runTablesCount) \
+            + ", mutacje: " + str(self.runMutation)

kelner/gui/GAdialog/GADialog.py

@@ -0,0 +1,82 @@
+import tkinter
+from tkinter import *
+
+from kelner.gui.GAdialog.GADefaults import CrossingOverMethod
+
+
+class GADialog:
+
+    def __init__(self, defaults):
+        self.__defaults = defaults
+        self.window = tkinter.Tk()
+        self.window.attributes('-topmost', 'true')
+        self.window.title(defaults.windowName)
+        self.__sliderTablesCount = self.__getSlider(0, defaults.minTablesCount, defaults.maxTablesCount, defaults.runTablesCount, defaults.sliderNameTablesCount)
+        self.__sliderPopulationSize = self.__getSlider(1, defaults.minPopulationSize, defaults.maxPopulationSize, defaults.runPopulationSize, defaults.sliderNamePopulationSize)
+        self.__sliderMutation = self.__getSlider(2,  defaults.minMutation, defaults.maxMutation, defaults.runMutation, defaults.sliderNameMutation)
+        self.__sliderGenerationsNumber = self.__getSlider(3, defaults.minGenerationsNumber, defaults.maxGenerationsNumber, defaults.runGenerationsNumber, defaults.sliderNameGenerationsNumber)
+        self.__sliderInfoFold = self.__getSlider(4, defaults.minGenerationsNumber,  defaults.maxGenerationsNumber, defaults.runInfoFold, defaults.sliderInfoFold)
+        self.__sliderElitism = self.__getSlider(5, defaults.minElitism, defaults.maxElitism, defaults.runElitism, defaults.sliderElitismName)
+
+        self.__radioSelectionMethodValue = IntVar()
+        self.__radioSelectionMethodValue.set(self.__defaults.runSelectionMethod)
+        self.__getRadioButton(6, defaults.defSelectionMethods, self.__radioSelectionMethodValue, defaults.radioSelectionMethodName)
+
+        self.__radioCrossingOverMethodValue = IntVar()
+        self.__radioCrossingOverMethodValue.set(self.__defaults.runCrossingOverMethod)
+        self.__getRadioButton(8, defaults.defCrossingOverMethods, self.__radioCrossingOverMethodValue, defaults.radioCrossingOverMethodName)
+
+        self.__radioMutationMethodValue = IntVar()
+        self.__radioMutationMethodValue.set(self.__defaults.runMutationMethod)
+        self.__getRadioButton(12, defaults.defMutationMethods, self.__radioMutationMethodValue, defaults.radioMutationMethodName)
+
+        self.__buttonDefaults = self.__getButton(15, 0, W, defaults.buttonDefaultsName, self.__setDefaults)
+        self.__buttonStart = self.__getButton(15, 1, E,  defaults.buttonStartName, self.__getAllValues)
+        self.window.mainloop()
+        
+    def __getSlider(self, rowNum, minVal, maxVal, runVal, labText):
+        label = Label(self.window, text = labText)
+        label.grid(row = rowNum, column = 0, sticky = S + W, padx = 5, pady = 5)
+        slider = Scale(self.window, variable = IntVar(), from_ = minVal, to = maxVal, orient=HORIZONTAL, length = 200)
+        slider.grid(row = rowNum, column = 1, sticky = E, padx = 5, pady = 3)
+        slider.set(runVal)
+        return slider
+
+    def __getButton(self, rowNum, colNum, stickPos, btnText, action):
+        button = Button(self.window, text = btnText, command = action)
+        button.grid(row = rowNum, column = colNum, stick = stickPos, columnspan = 2, padx=60, pady=5)
+        return button
+
+    def __getRadioButton(self, rowNum, methods, variable, labText):
+        label = LabelFrame(self.window, text = labText)
+        label.grid(row=rowNum, column=0, columnspan=2,  padx=5, pady=5, sticky=W)
+        rowNum += 1
+        iteration = 0
+        for text, mode in methods:
+            radio = Radiobutton(label, text = text, variable = variable, value = mode)
+            radio.grid(row = rowNum, column = iteration % 2, sticky = W, padx = 5, pady = 3)
+            rowNum += iteration % 2
+            iteration += 1
+
+    def __setDefaults(self):
+        self.__sliderTablesCount.set(self.__defaults.defTablesCount)
+        self.__sliderPopulationSize.set(self.__defaults.defPopulationSize)
+        self.__sliderMutation.set(self.__defaults.defMutation)
+        self.__sliderGenerationsNumber.set(self.__defaults.defGenerationsNumber)
+        self.__sliderInfoFold.set(self.__defaults.defInfoFold)
+        self.__sliderElitism.set(self.__defaults.defElitism)
+        self.__radioSelectionMethodValue.set(self.__defaults.defSelectionMethod)
+        self.__radioCrossingOverMethodValue.set(self.__defaults.defCrossingOverMethod)
+        self.__radioMutationMethodValue.set(self.__defaults.defMutationMethod)
+
+    def __getAllValues(self):
+        self.__defaults.runTablesCount = self.__sliderTablesCount.get()
+        self.__defaults.runPopulationSize = self.__sliderPopulationSize.get()
+        self.__defaults.runMutation = self.__sliderMutation.get()
+        self.__defaults.runGenerationsNumber = self.__sliderGenerationsNumber.get()
+        self.__defaults.runInfoFold = self.__sliderInfoFold.get()
+        self.__defaults.runElitism = self.__sliderElitism.get()
+        self.__defaults.runSelectionMethod = self.__radioSelectionMethodValue.get()
+        self.__defaults.runCrossingOverMethod = self.__radioCrossingOverMethodValue.get()
+        self.__defaults.runMutationMethod = self.__radioMutationMethodValue.get()
+        self.window.destroy()

kelner/gui/chart/Plots.py

@@ -0,0 +1,22 @@
+import matplotlib.pyplot as plt
+
+
+class Plots:
+
+    def __init__(self, generationNumber, bestFitnesses, bestTabless, worstFitnesses, worstTables, title):
+        self.__generationsNumber = generationNumber
+        self.__bestFitnesses = bestFitnesses
+        self.__bestTables = bestTabless
+        self.__worstTables = worstTables
+        self.__worstFitnesses = worstFitnesses
+        self.__title = title
+
+    def draw(self):
+        generations = [i for i in range(self.__generationsNumber + 1)]
+        plt.figure(num = self.__title)
+        plt.plot(generations, self.__bestTables, label = "stoliki najlepszego")
+        plt.plot(generations, self.__bestFitnesses, label="fitness najlepszego")
+        plt.plot(generations, self.__worstTables, label = "stoliki najgorszego")
+        plt.plot(generations, self.__worstFitnesses, label = "fitness najgorszego")
+        plt.legend()
+        plt.show()