From f94b6a3b44e99a181fec060e29bf8827a9aa846b Mon Sep 17 00:00:00 2001
From: s452726 <aleros8@st.amu.edu.pl>
Date: Tue, 22 Jun 2021 19:15:39 +0200
Subject: [PATCH] =?UTF-8?q?Poprawienie=20=C5=9Bcie=C5=BCek=20z=20bezwzgl?=
 =?UTF-8?q?=C4=99dnych=20na=20wzgl=C4=99dne.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml          |  2 +-
 .idea/smieciara.iml     |  2 +-
 .idea/workspace.xml     | 41 +++++++++++++++++++++++++++++++++++++----
 neural_network.py       |  2 +-
 neural_network2.py      |  2 +-
 neural_network_vers2.py |  8 ++++----
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ea01f0b..8d93904 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (untitled2)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/smieciara.iml b/.idea/smieciara.iml
index c67b363..d9e6024 100644
--- a/.idea/smieciara.iml
+++ b/.idea/smieciara.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.7 (untitled2)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 686b5de..bfcb7f8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="9f88f6ee-b4a6-4771-930e-edad9600a746" name="Default Changelist" comment="" />
+    <list default="true" id="9f88f6ee-b4a6-4771-930e-edad9600a746" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/neural_network.py" beforeDir="false" afterPath="$PROJECT_DIR$/neural_network.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/neural_network2.py" beforeDir="false" afterPath="$PROJECT_DIR$/neural_network2.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/neural_network_vers2.py" beforeDir="false" afterPath="$PROJECT_DIR$/neural_network_vers2.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -42,7 +47,7 @@
       <recent name="C:\Users\micha\Desktop\smieciara" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.genetic_algorithm (1)">
+  <component name="RunManager" selected="Python.main">
     <configuration name="genetic_algorithm (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="smieciara" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -92,7 +97,7 @@
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="C:\Users\Natalia\PycharmProjects\untitled2\venv\Scripts\python.exe" />
+      <option name="SDK_HOME" value="/usr/local/bin/python3.9" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
@@ -106,11 +111,16 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="Python.genetic_algorithm" />
+      <item itemvalue="Python.genetic_algorithm (1)" />
+      <item itemvalue="Python.main" />
+    </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.main" />
         <item itemvalue="Python.genetic_algorithm (1)" />
         <item itemvalue="Python.genetic_algorithm" />
-        <item itemvalue="Python.main" />
       </list>
     </recent_temporary>
   </component>
@@ -138,6 +148,29 @@
       <option name="presentableId" value="Default" />
       <updated>1615920190869</updated>
     </task>
+    <task id="LOCAL-00001" summary="Dodanie projektu">
+      <created>1624381365660</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1624381365660</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </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="Dodanie projektu" />
+    <option name="LAST_COMMIT_MESSAGE" value="Dodanie projektu" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/neural_network.py b/neural_network.py
index 83f7379..de2ce5a 100644
--- a/neural_network.py
+++ b/neural_network.py
@@ -48,6 +48,6 @@ history = model.fit(x=X_train, y=y_train, validation_split=0.1, epochs=100, batc
 
 #model.evaluate(X_test, y_test)
 
-model.save('C:/Users/Natalia/Desktop/lsm04/smieciara/saved_model')
+model.save('./saved_model')
 
 
diff --git a/neural_network2.py b/neural_network2.py
index eb80cba..67db075 100644
--- a/neural_network2.py
+++ b/neural_network2.py
@@ -14,7 +14,7 @@ def b():
     a = dff.sample()
     pred(a)
 
-model = tf.keras.models.load_model('C:/Users/Natalia/Desktop/lsm04/smieciara/saved_model')
+model = tf.keras.models.load_model('./saved_model')
 
 
 def pred(a):
diff --git a/neural_network_vers2.py b/neural_network_vers2.py
index 1541381..65ae25d 100644
--- a/neural_network_vers2.py
+++ b/neural_network_vers2.py
@@ -8,15 +8,15 @@ from PIL import Image
 img_height = 180
 img_width = 180
 class_names=['glass','metal','paper','plastic']
-model = tf.keras.models.load_model('C:/Users/Natalia/Desktop/lsm04/smieciara/saved_model_vers2')
+model = tf.keras.models.load_model('./saved_model_vers2')
 def predict():
-    path="C:/Users/Natalia/Documents/dane_testowe"
+    path="./dane_testowe"
     files=os.listdir(path)
     d=random.choice(files)
-    im = Image.open("C:/Users/Natalia/Documents/dane_testowe/" + d)
+    im = Image.open("./dane_testowe/" + d)
     im.show()
     img = keras.preprocessing.image.load_img(
-        "C:/Users/Natalia/Documents/dane_testowe/" + d, target_size=(img_height, img_width)
+        "./dane_testowe/" + d, target_size=(img_height, img_width)
     )
     img_array = keras.preprocessing.image.img_to_array(img)
     img_array = tf.expand_dims(img_array, 0) # Create a batch