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] 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