From dfe2e5041423ad9720cb3741457bcb052fbac39d Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Mon, 18 May 2020 17:24:03 +0200
Subject: [PATCH 1/6] create Shelf

---
 .idea/misc.xml      |  2 +-
 .idea/workspace.xml | 29 +++++++++++++++++++++++------
 .idea/wozek.iml     |  2 +-
 shelf.py            | 12 ++++++++++++
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 shelf.py

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 52c15d7..8656114 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (wozek)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95a134d..fcf7da5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="828778c9-9d97-422f-a727-18ddbd059b85" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/shelf.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/functions.py" beforeDir="false" afterPath="$PROJECT_DIR$/functions.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/wozek.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/wozek.iml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,6 +21,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectId" id="1blUxWbA3VMjMFjk8gUnLGMgAoU" />
@@ -29,6 +34,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="restartRequiresConfirmation" value="false" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -87,6 +93,10 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="Python.board" />
+      <item itemvalue="Python.main" />
+    </list>
     <recent_temporary>
       <list>
         <item itemvalue="Python.main" />
@@ -109,6 +119,11 @@
       <workItem from="1589543001064" duration="78000" />
       <workItem from="1589543305930" duration="10474000" />
       <workItem from="1589561555146" duration="3374000" />
+      <workItem from="1589745328635" duration="27000" />
+      <workItem from="1589745409339" duration="739000" />
+      <workItem from="1589752301424" duration="1007000" />
+      <workItem from="1589753322316" duration="835000" />
+      <workItem from="1589814601057" duration="822000" />
     </task>
     <servers />
   </component>
@@ -120,15 +135,17 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
     </option>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/wozek$board.coverage" NAME="board Coverage Results" MODIFIED="1589210811600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589564478428" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589754127142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/wozek$main.coverage" NAME="main Coverage Results" MODIFIED="1589556038208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/wozek$board.coverage" NAME="board Coverage Results" MODIFIED="1589210811600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/wozek.iml b/.idea/wozek.iml
index 85c7612..fa80a76 100644
--- a/.idea/wozek.iml
+++ b/.idea/wozek.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/shelf.py b/shelf.py
new file mode 100644
index 0000000..eb9e8f7
--- /dev/null
+++ b/shelf.py
@@ -0,0 +1,12 @@
+import pygame
+
+class Shelf:
+
+    def __init__(self, id, field):
+        self.id = id
+        self.field = field
+        self.products = []
+
+    def addProduct(self, sweet):
+        self.products.append(sweet)
+

From 8ec5e96e8cd6caba84277c279cc65a6860638f22 Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Mon, 18 May 2020 17:33:48 +0200
Subject: [PATCH 2/6] create addShelf method in Field class

---
 .idea/workspace.xml | 19 +++++++++++++++----
 field.py            |  8 +++++++-
 shelf.py            |  5 ++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fcf7da5..5c1c2d0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="828778c9-9d97-422f-a727-18ddbd059b85" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/shelf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/wozek.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/wozek.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/field.py" beforeDir="false" afterPath="$PROJECT_DIR$/field.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shelf.py" beforeDir="false" afterPath="$PROJECT_DIR$/shelf.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -123,8 +122,16 @@
       <workItem from="1589745409339" duration="739000" />
       <workItem from="1589752301424" duration="1007000" />
       <workItem from="1589753322316" duration="835000" />
-      <workItem from="1589814601057" duration="822000" />
+      <workItem from="1589814601057" duration="1397000" />
     </task>
+    <task id="LOCAL-00001" summary="create Shelf">
+      <created>1589815443652</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1589815443652</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -143,6 +150,10 @@
       </map>
     </option>
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="create Shelf" />
+    <option name="LAST_COMMIT_MESSAGE" value="create Shelf" />
+  </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589754127142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/wozek$main.coverage" NAME="main Coverage Results" MODIFIED="1589556038208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
diff --git a/field.py b/field.py
index 033612c..c425d69 100644
--- a/field.py
+++ b/field.py
@@ -1,4 +1,5 @@
 import pygame
+from shelf import Shelf
 
 
 class Field:
@@ -14,6 +15,7 @@ class Field:
         self.is_occupied_by_agent = is_occupied_by_agent
         self.cost_of_travel = cost_of_travel
         self.neighbors = []
+        self.shelves = []
 
         # Te parametry są potrzebne do algorytmu A*
         self.g = 0
@@ -41,4 +43,8 @@ class Field:
         if self.y > 0 and board[self.y - 1][self.x].is_shelf == False:
             self.neighbors.append(board[self.y - 1][self.x])
         if self.y < 9 and board[self.y + 1][self.x].is_shelf == False:
-            self.neighbors.append(board[self.y + 1][self.x])
\ No newline at end of file
+            self.neighbors.append(board[self.y + 1][self.x])
+
+    def addShelf(self):
+        shelf = Shelf(len(self.shelves)+1)
+        self.shelves.append(shelf)
\ No newline at end of file
diff --git a/shelf.py b/shelf.py
index eb9e8f7..3e318d7 100644
--- a/shelf.py
+++ b/shelf.py
@@ -1,12 +1,11 @@
 import pygame
 
+
 class Shelf:
 
-    def __init__(self, id, field):
+    def __init__(self, id):
         self.id = id
-        self.field = field
         self.products = []
 
     def addProduct(self, sweet):
         self.products.append(sweet)
-

From 88cc968b0abb1317b7de1537775f23a4e5207c22 Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Mon, 18 May 2020 19:16:36 +0200
Subject: [PATCH 3/6] changed CreateDataSweets to lowercase

---
 .idea/workspace.xml         | 21 ++++++++++++++++-----
 Assiging/feature_hashing.py |  6 ++++++
 data.py                     |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 Assiging/feature_hashing.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c1c2d0..a22380b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="828778c9-9d97-422f-a727-18ddbd059b85" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Assiging/feature_hashing.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/field.py" beforeDir="false" afterPath="$PROJECT_DIR$/field.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shelf.py" beforeDir="false" afterPath="$PROJECT_DIR$/shelf.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data.py" beforeDir="false" afterPath="$PROJECT_DIR$/data.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,6 +28,9 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectId" id="1blUxWbA3VMjMFjk8gUnLGMgAoU" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -122,7 +125,7 @@
       <workItem from="1589745409339" duration="739000" />
       <workItem from="1589752301424" duration="1007000" />
       <workItem from="1589753322316" duration="835000" />
-      <workItem from="1589814601057" duration="1397000" />
+      <workItem from="1589814601057" duration="2835000" />
     </task>
     <task id="LOCAL-00001" summary="create Shelf">
       <created>1589815443652</created>
@@ -131,7 +134,14 @@
       <option name="project" value="LOCAL" />
       <updated>1589815443652</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="create addShelf method in Field class">
+      <created>1589816028640</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1589816028640</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -152,7 +162,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="create Shelf" />
-    <option name="LAST_COMMIT_MESSAGE" value="create Shelf" />
+    <MESSAGE value="create addShelf method in Field class" />
+    <option name="LAST_COMMIT_MESSAGE" value="create addShelf method in Field class" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589754127142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
diff --git a/Assiging/feature_hashing.py b/Assiging/feature_hashing.py
new file mode 100644
index 0000000..b225e0a
--- /dev/null
+++ b/Assiging/feature_hashing.py
@@ -0,0 +1,6 @@
+from sklearn.feature_extraction import FeatureHasher
+from data import create_data_sweets
+
+data = create_data_sweets()
+
+
diff --git a/data.py b/data.py
index 8d55fcd..c101d40 100644
--- a/data.py
+++ b/data.py
@@ -1,7 +1,7 @@
 from sweets import Sweets
 
 
-def createDataSweets():
+def create_data_sweets():
     allProducts = []
 
     sweet = Sweets('Mars', 'czekoladowy', 'baton', 'sredni', 2.49)

From bfd63cb1dcdc0714f7c847a9608883f01d64afcf Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Mon, 18 May 2020 19:39:40 +0200
Subject: [PATCH 4/6] create datadict

---
 .idea/workspace.xml         | 44 ++++++++++++++++++++++++++++++++-----
 Assiging/datadict.py        | 28 +++++++++++++++++++++++
 Assiging/feature_hashing.py |  5 ++---
 data.py                     |  2 +-
 4 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 Assiging/datadict.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a22380b..bdc85db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="828778c9-9d97-422f-a727-18ddbd059b85" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Assiging/feature_hashing.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assiging/datadict.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assiging/feature_hashing.py" beforeDir="false" afterPath="$PROJECT_DIR$/Assiging/feature_hashing.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data.py" beforeDir="false" afterPath="$PROJECT_DIR$/data.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -50,7 +51,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.main">
+  <component name="RunManager" selected="Python.feature_hashing">
     <configuration name="board" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="wozek" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -73,6 +74,28 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="feature_hashing" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="wozek" />
+      <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$/Assiging" />
+      <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$/Assiging/feature_hashing.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>
     <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="wozek" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -98,9 +121,11 @@
     <list>
       <item itemvalue="Python.board" />
       <item itemvalue="Python.main" />
+      <item itemvalue="Python.feature_hashing" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.feature_hashing" />
         <item itemvalue="Python.main" />
         <item itemvalue="Python.board" />
       </list>
@@ -125,7 +150,7 @@
       <workItem from="1589745409339" duration="739000" />
       <workItem from="1589752301424" duration="1007000" />
       <workItem from="1589753322316" duration="835000" />
-      <workItem from="1589814601057" duration="2835000" />
+      <workItem from="1589814601057" duration="4208000" />
     </task>
     <task id="LOCAL-00001" summary="create Shelf">
       <created>1589815443652</created>
@@ -141,7 +166,14 @@
       <option name="project" value="LOCAL" />
       <updated>1589816028640</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="changed CreateDataSweets to lowercase">
+      <created>1589822196451</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1589822196451</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -163,10 +195,12 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="create Shelf" />
     <MESSAGE value="create addShelf method in Field class" />
-    <option name="LAST_COMMIT_MESSAGE" value="create addShelf method in Field class" />
+    <MESSAGE value="changed CreateDataSweets to lowercase" />
+    <option name="LAST_COMMIT_MESSAGE" value="changed CreateDataSweets to lowercase" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589754127142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/AL_2020$feature_hashing.coverage" NAME="feature_hashing Coverage Results" MODIFIED="1589822405133" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Assiging" />
     <SUITE FILE_PATH="coverage/wozek$main.coverage" NAME="main Coverage Results" MODIFIED="1589556038208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/wozek$board.coverage" NAME="board Coverage Results" MODIFIED="1589210811600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
diff --git a/Assiging/datadict.py b/Assiging/datadict.py
new file mode 100644
index 0000000..844b4b8
--- /dev/null
+++ b/Assiging/datadict.py
@@ -0,0 +1,28 @@
+from sweets import Sweets
+
+
+def create_data_dict():
+    products_as_dict = []
+
+    sweet = Sweets('Mars', 'czekoladowy', 'baton', 'sredni', 2.49)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'duzy', 4.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'ogromny', 11.26)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('M&M', 'czekoladowy', 'czekolada', 'duzy', 3.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('M&M', 'czekoladowy', 'baton', 'sredni', 2.89)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'bananowy', 'landrynka', 'maly', 0.39)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'truskawkowy', 'landrynka', 'maly', 0.39)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'cola', 'landrynka', 'maly', 0.49)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Wedel', 'czekoladowy', 'baton', 'sredni', 1.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Maoam', 'truskawkowy', 'guma', 'maly', 0.25)
+    products_as_dict.append(vars(sweet))
+
+    return  products_as_dict
diff --git a/Assiging/feature_hashing.py b/Assiging/feature_hashing.py
index b225e0a..0b999c9 100644
--- a/Assiging/feature_hashing.py
+++ b/Assiging/feature_hashing.py
@@ -1,6 +1,5 @@
 from sklearn.feature_extraction import FeatureHasher
-from data import create_data_sweets
-
-data = create_data_sweets()
 
 
+
+print(f.toarray())
\ No newline at end of file
diff --git a/data.py b/data.py
index c101d40..659a169 100644
--- a/data.py
+++ b/data.py
@@ -25,4 +25,4 @@ def create_data_sweets():
     sweet = Sweets('Maoam', 'truskawkowy', 'guma', 'maly', 0.25)
     allProducts.append(sweet)
 
-    return  allProducts
\ No newline at end of file
+    return  allProducts

From 0630d99a4804666953d2e82f51c110d0471cd610 Mon Sep 17 00:00:00 2001
From: shaaqu <pawel.lukaszewicz99@gmail.com>
Date: Mon, 18 May 2020 19:43:25 +0200
Subject: [PATCH 5/6] moved create_data_dict to data file; deleted datadict
 file

---
 .idea/workspace.xml         |  2 +-
 Assiging/datadict.py        | 28 ----------------------------
 Assiging/feature_hashing.py |  6 +++---
 data.py                     | 27 +++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 32 deletions(-)
 delete mode 100644 Assiging/datadict.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bdc85db..e8d76cf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -200,7 +200,7 @@
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589754127142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/AL_2020$feature_hashing.coverage" NAME="feature_hashing Coverage Results" MODIFIED="1589822405133" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Assiging" />
+    <SUITE FILE_PATH="coverage/AL_2020$feature_hashing.coverage" NAME="feature_hashing Coverage Results" MODIFIED="1589823737949" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Assiging" />
     <SUITE FILE_PATH="coverage/wozek$main.coverage" NAME="main Coverage Results" MODIFIED="1589556038208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/wozek$board.coverage" NAME="board Coverage Results" MODIFIED="1589210811600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
diff --git a/Assiging/datadict.py b/Assiging/datadict.py
deleted file mode 100644
index 844b4b8..0000000
--- a/Assiging/datadict.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from sweets import Sweets
-
-
-def create_data_dict():
-    products_as_dict = []
-
-    sweet = Sweets('Mars', 'czekoladowy', 'baton', 'sredni', 2.49)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'duzy', 4.99)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'ogromny', 11.26)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('M&M', 'czekoladowy', 'czekolada', 'duzy', 3.99)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('M&M', 'czekoladowy', 'baton', 'sredni', 2.89)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Nestle', 'bananowy', 'landrynka', 'maly', 0.39)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Nestle', 'truskawkowy', 'landrynka', 'maly', 0.39)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Nestle', 'cola', 'landrynka', 'maly', 0.49)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Wedel', 'czekoladowy', 'baton', 'sredni', 1.99)
-    products_as_dict.append(vars(sweet))
-    sweet = Sweets('Maoam', 'truskawkowy', 'guma', 'maly', 0.25)
-    products_as_dict.append(vars(sweet))
-
-    return  products_as_dict
diff --git a/Assiging/feature_hashing.py b/Assiging/feature_hashing.py
index 0b999c9..479b42f 100644
--- a/Assiging/feature_hashing.py
+++ b/Assiging/feature_hashing.py
@@ -1,5 +1,5 @@
 from sklearn.feature_extraction import FeatureHasher
+from data import create_data_dict
 
-
-
-print(f.toarray())
\ No newline at end of file
+data = create_data_dict()
+print(data)
\ No newline at end of file
diff --git a/data.py b/data.py
index 659a169..ac9ddb2 100644
--- a/data.py
+++ b/data.py
@@ -26,3 +26,30 @@ def create_data_sweets():
     allProducts.append(sweet)
 
     return  allProducts
+
+
+def create_data_dict():
+    products_as_dict = []
+
+    sweet = Sweets('Mars', 'czekoladowy', 'baton', 'sredni', 2.49)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'duzy', 4.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Mars', 'czekoladowy', 'czekolada', 'ogromny', 11.26)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('M&M', 'czekoladowy', 'czekolada', 'duzy', 3.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('M&M', 'czekoladowy', 'baton', 'sredni', 2.89)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'bananowy', 'landrynka', 'maly', 0.39)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'truskawkowy', 'landrynka', 'maly', 0.39)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Nestle', 'cola', 'landrynka', 'maly', 0.49)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Wedel', 'czekoladowy', 'baton', 'sredni', 1.99)
+    products_as_dict.append(vars(sweet))
+    sweet = Sweets('Maoam', 'truskawkowy', 'guma', 'maly', 0.25)
+    products_as_dict.append(vars(sweet))
+
+    return  products_as_dict

From cd6a2191f7688a008022f339ac0383e2018fad90 Mon Sep 17 00:00:00 2001
From: Tomek <zipoland@gmail.com>
Date: Tue, 19 May 2020 12:20:50 +0200
Subject: [PATCH 6/6] sprwdzenie poprawnosci dzialania mojego lokalnego
 repozytorum

---
 route-planning.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/route-planning.md b/route-planning.md
index ca850b4..a858ead 100644
--- a/route-planning.md
+++ b/route-planning.md
@@ -93,7 +93,6 @@ let winner = 0;
 let current = openSet[winner];
 ```
 
-
 ### Definicja przyjętej heurystyki
 Jest to szacowana odległość od sprawdzanego pola do celu. Obliczana jest jako `Manhattan Distance`, ponieważ w naszym modelu Agent nie może poruszać się po skosie.