From ada739de342db8da1c3bd28cee777d1f5090ab02 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Mon, 7 Jan 2019 23:08:55 +0100
Subject: [PATCH 1/8] dziala rysowanie punkto, to sie mz eprzydac ;)

---
 szukaj.py | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/szukaj.py b/szukaj.py
index 9c65867..48ecbed 100644
--- a/szukaj.py
+++ b/szukaj.py
@@ -1,12 +1,14 @@
 import random
+import math as m
+import matplotlib.pyplot as plt
 #globals
 punkty = []
 
 #miasta
 class miasta:
     nrMiasta = 0
-    wspX = 0
-    wspY = 0
+    wspX = 0.0
+    wspY = 0.0
 
     def __init__(self,nr,wsx,wsy):
         self.nrMiasta = nr
@@ -21,6 +23,32 @@ def generatorMiast(n):
     for i in range (1,n+1):
         punkty.append(miasta(i,random.randint(1,100),random.randint(1,100)))
 
-generatorMiast(3)
+def tabCr():
+    for o in punkty:
+        for p in punkty:
+            if o.nrMiasta == p.nrMiasta:
+                pass
+            else:
+                dist = m.sqrt(m.pow(m.fabs(p.wspY - o.wspY),2)+m.pow(m.fabs(p.wspX - p.wspX),2))
+                print("Nr: " + str(o.nrMiasta) +" to Nr: "+ str(p.nrMiasta)+ ", DIST: "+str(dist))
+def plotCr():
+    plt.title("Punkty do odwiedzenia")
+    plt.xlabel("X")
+    plt.ylabel("Y")
+    X = []
+    Y = []
+    for o in punkty:
+        X.append(o.wspX)
+        Y.append(o.wspY)
+        plt.annotate(str(o.nrMiasta),(o.wspX,o.wspY))
+    #plt.plot(X,Y)
+    plt.scatter(X,Y)
+    plt.grid()
+    plt.show()
+
+generatorMiast(15)
 for o in punkty:
-    o.allPrt()
\ No newline at end of file
+    o.allPrt()
+tabCr()
+plotCr()
+

From 20ea0d53ce5794f36517afd90ee8c2f47b202517 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 00:01:25 +0100
Subject: [PATCH 2/8] dziala wysowanie punktow! i wyznacza jakas droge!

---
 .idea/workspace.xml | 126 +++++++++++++++++++++++++++++++++++---------
 szukaj.py           |  30 ++++++++---
 2 files changed, 125 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6a7aa0..55b5711 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="48cee0e6-d903-4fdb-87f1-e0c964037856" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/odrzucone.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/thr.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/zal2.py" beforeDir="false" afterPath="$PROJECT_DIR$/zal2.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/szukaj.py" beforeDir="false" afterPath="$PROJECT_DIR$/szukaj.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -28,8 +26,8 @@
       <file leaf-file-name="zaliczenie.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/zaliczenie.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1245">
-              <caret line="83" column="31" lean-forward="true" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+            <state relative-caret-position="1185">
+              <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
               </folding>
@@ -37,10 +35,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="zal2.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="zal2.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/zal2.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="410">
+            <state relative-caret-position="635">
               <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
               <folding>
                 <element signature="e#14#27#0" expanded="true" />
@@ -49,6 +47,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/szukaj.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="440">
+              <caret line="63" column="17" selection-start-line="63" selection-start-column="17" selection-end-line="63" selection-end-column="17" />
+              <folding>
+                <element signature="e#0#13#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="odrzucone.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/odrzucone.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -61,8 +71,8 @@
       <file leaf-file-name="thr.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/thr.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
+            <state relative-caret-position="285">
+              <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
               <folding>
                 <element signature="e#0#16#0" expanded="true" />
               </folding>
@@ -119,7 +129,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="Klient" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
   </component>
@@ -135,6 +145,7 @@
         <option value="$PROJECT_DIR$/thr.py" />
         <option value="$PROJECT_DIR$/odrzucone.py" />
         <option value="$PROJECT_DIR$/zal2.py" />
+        <option value="$PROJECT_DIR$/szukaj.py" />
       </list>
     </option>
   </component>
@@ -152,6 +163,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -163,7 +175,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -181,8 +192,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.zal2">
-    <configuration name="cli" type="PythonConfigurationType" factoryName="Python" temporary="true">
+  <component name="RunManager" selected="Python.szukaj">
+    <configuration name="server" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -194,13 +205,13 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/cli.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/server" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
-    <configuration name="server" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="szukaj" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -212,7 +223,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/server" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/szukaj.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -274,18 +285,18 @@
     </configuration>
     <list>
       <item itemvalue="Python.server" />
-      <item itemvalue="Python.cli" />
       <item itemvalue="Python.zaliczenie" />
       <item itemvalue="Python.zal2" />
       <item itemvalue="Python.thr" />
+      <item itemvalue="Python.szukaj" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.szukaj" />
         <item itemvalue="Python.zal2" />
         <item itemvalue="Python.thr" />
         <item itemvalue="Python.zaliczenie" />
         <item itemvalue="Python.server" />
-        <item itemvalue="Python.cli" />
       </list>
     </recent_temporary>
   </component>
@@ -384,11 +395,33 @@
       <option name="project" value="LOCAL" />
       <updated>1546211048396</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="watki dzialaja, nie dziala przerwanie mcastlistenera, ale cos sie trwaorzy">
+      <created>1546470946164</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1546470946165</updated>
+    </task>
+    <task id="LOCAL-00014" summary="PSI - lab1 -'The Beggining'">
+      <created>1546895823892</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1546895823892</updated>
+    </task>
+    <task id="LOCAL-00015" summary="dziala rysowanie punkto, to sie mz eprzydac ;)">
+      <created>1546898935641</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1546898935641</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="-2" y="48" width="1924" height="1036" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13751318" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -427,9 +460,42 @@
     <MESSAGE value="prosty sender" />
     <MESSAGE value="wysylanie dziala" />
     <MESSAGE value="nic juz nie dziala" />
-    <option name="LAST_COMMIT_MESSAGE" value="nic juz nie dziala" />
+    <MESSAGE value="watki dzialaja, nie dziala przerwanie mcastlistenera, ale cos sie trwaorzy" />
+    <MESSAGE value="PSI - lab1 -'The Beggining'" />
+    <MESSAGE value="dziala rysowanie punkto, to sie mz eprzydac ;)" />
+    <option name="LAST_COMMIT_MESSAGE" value="dziala rysowanie punkto, to sie mz eprzydac ;)" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#16#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/serv.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/zal2.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1545">
+          <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
+          <folding>
+            <element signature="e#14#27#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/server">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="480">
@@ -770,8 +836,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/zaliczenie.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1245">
-          <caret line="83" column="31" lean-forward="true" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+        <state relative-caret-position="1185">
+          <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
           </folding>
@@ -780,8 +846,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/thr.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
+        <state relative-caret-position="285">
+          <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
           <folding>
             <element signature="e#0#16#0" expanded="true" />
           </folding>
@@ -797,7 +863,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/zal2.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
+        <state relative-caret-position="635">
           <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
           <folding>
             <element signature="e#14#27#0" expanded="true" />
@@ -805,5 +871,15 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/szukaj.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="63" column="17" selection-start-line="63" selection-start-column="17" selection-end-line="63" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/szukaj.py b/szukaj.py
index 48ecbed..001c0ac 100644
--- a/szukaj.py
+++ b/szukaj.py
@@ -3,6 +3,7 @@
 import matplotlib.pyplot as plt
 #globals
 punkty = []
+wynik = []
 
 #miasta
 class miasta:
@@ -31,24 +32,41 @@ def tabCr():
             else:
                 dist = m.sqrt(m.pow(m.fabs(p.wspY - o.wspY),2)+m.pow(m.fabs(p.wspX - p.wspX),2))
                 print("Nr: " + str(o.nrMiasta) +" to Nr: "+ str(p.nrMiasta)+ ", DIST: "+str(dist))
-def plotCr():
+def plotCr(pkts):
     plt.title("Punkty do odwiedzenia")
     plt.xlabel("X")
     plt.ylabel("Y")
     X = []
     Y = []
-    for o in punkty:
+    for o in pkts:
         X.append(o.wspX)
         Y.append(o.wspY)
         plt.annotate(str(o.nrMiasta),(o.wspX,o.wspY))
-    #plt.plot(X,Y)
-    plt.scatter(X,Y)
+    plt.plot(X,Y)
+    #plt.scatter(X,Y)
     plt.grid()
     plt.show()
 
+def engine(czyPierwszy):
+    if czyPierwszy:
+        wynik.append(punkty[0])
+        del punkty[0]
+    distTmp = []
+    for o in punkty:
+        distTmp.append(m.sqrt(m.pow((o.wspY - wynik[len(wynik) -1].wspY),2) + m.pow((o.wspX - wynik[len(wynik) -1].wspX),2)))
+    tmpMin = min(distTmp)
+    wynik.append(punkty[distTmp.index(tmpMin)])
+    del punkty[distTmp.index(tmpMin)]
+    if punkty:
+        engine(False)
+
+
 generatorMiast(15)
 for o in punkty:
     o.allPrt()
-tabCr()
-plotCr()
+#tabCr()
+engine(True)
+for o in wynik:
+    o.allPrt()
+plotCr(wynik)
 

From e232d1ff79568d5d32a1567f3bfc1e26515a63e6 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 17:50:33 +0100
Subject: [PATCH 3/8] poczatek lab 2. algorytmy genetyczne

---
 genAl.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 genAl.py

diff --git a/genAl.py b/genAl.py
new file mode 100644
index 0000000..0a6a963
--- /dev/null
+++ b/genAl.py
@@ -0,0 +1,14 @@
+import random
+#populacje
+pBadana = [] #populacja badana
+
+#sprawdzanie dopasowania
+def sprDop(x):
+    if x <1 or x >127:
+        return 0
+    return 2 * (pow(x,2) + 1)
+
+#generator ppulacji
+def genP(x):
+    for i in range(0,x):
+        pBadana.append(random.randint(1,127))
\ No newline at end of file

From fdd30c516493ecc0cf2e31f844e739b70297fc90 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 17:50:51 +0100
Subject: [PATCH 4/8] maly refactor

---
 .idea/workspace.xml | 58 +++++++++++++++++++++++++++++----------------
 szukaj.py           |  2 +-
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 55b5711..c6a052b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="48cee0e6-d903-4fdb-87f1-e0c964037856" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/genAl.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/szukaj.py" beforeDir="false" afterPath="$PROJECT_DIR$/szukaj.py" afterDir="false" />
     </list>
@@ -38,7 +39,7 @@
       <file leaf-file-name="zal2.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/zal2.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="635">
+            <state relative-caret-position="1515">
               <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
               <folding>
                 <element signature="e#14#27#0" expanded="true" />
@@ -47,11 +48,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/szukaj.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="63" column="17" selection-start-line="63" selection-start-column="17" selection-end-line="63" selection-end-column="17" />
+            <state relative-caret-position="465">
+              <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -59,6 +60,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="genAl.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/genAl.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="odrzucone.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/odrzucone.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -146,6 +156,7 @@
         <option value="$PROJECT_DIR$/odrzucone.py" />
         <option value="$PROJECT_DIR$/zal2.py" />
         <option value="$PROJECT_DIR$/szukaj.py" />
+        <option value="$PROJECT_DIR$/genAl.py" />
       </list>
     </option>
   </component>
@@ -416,7 +427,14 @@
       <option name="project" value="LOCAL" />
       <updated>1546898935641</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="dziala wysowanie punktow! i wyznacza jakas droge!">
+      <created>1546902085708</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1546902085708</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -425,14 +443,14 @@
     <layout>
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13751318" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50052685" side_tool="true" weight="0.37843785" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Python Console" order="7" />
       <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.24642465" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.37880793" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49947312" weight="0.37843785" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -463,19 +481,10 @@
     <MESSAGE value="watki dzialaja, nie dziala przerwanie mcastlistenera, ale cos sie trwaorzy" />
     <MESSAGE value="PSI - lab1 -'The Beggining'" />
     <MESSAGE value="dziala rysowanie punkto, to sie mz eprzydac ;)" />
-    <option name="LAST_COMMIT_MESSAGE" value="dziala rysowanie punkto, to sie mz eprzydac ;)" />
+    <MESSAGE value="dziala wysowanie punktow! i wyznacza jakas droge!" />
+    <option name="LAST_COMMIT_MESSAGE" value="dziala wysowanie punktow! i wyznacza jakas droge!" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#16#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/serv.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -863,7 +872,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/zal2.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="635">
+        <state relative-caret-position="1515">
           <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
           <folding>
             <element signature="e#14#27#0" expanded="true" />
@@ -873,13 +882,20 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/szukaj.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="63" column="17" selection-start-line="63" selection-start-column="17" selection-end-line="63" selection-end-column="17" />
+        <state relative-caret-position="465">
+          <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/genAl.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/szukaj.py b/szukaj.py
index 001c0ac..3238bfc 100644
--- a/szukaj.py
+++ b/szukaj.py
@@ -30,7 +30,7 @@ def tabCr():
             if o.nrMiasta == p.nrMiasta:
                 pass
             else:
-                dist = m.sqrt(m.pow(m.fabs(p.wspY - o.wspY),2)+m.pow(m.fabs(p.wspX - p.wspX),2))
+                dist = m.sqrt(pow(m.fabs(p.wspY - o.wspY),2)+pow(m.fabs(p.wspX - p.wspX),2))
                 print("Nr: " + str(o.nrMiasta) +" to Nr: "+ str(p.nrMiasta)+ ", DIST: "+str(dist))
 def plotCr(pkts):
     plt.title("Punkty do odwiedzenia")

From c06b2b8ec18f74297fe434a0695d0e3a9c5cfa86 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 18:11:33 +0100
Subject: [PATCH 5/8] narazie koniec, poczatek silnika programu

---
 genAl.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/genAl.py b/genAl.py
index 0a6a963..9ef1bc6 100644
--- a/genAl.py
+++ b/genAl.py
@@ -1,6 +1,7 @@
 import random
 #populacje
 pBadana = [] #populacja badana
+wyniki = []
 
 #sprawdzanie dopasowania
 def sprDop(x):
@@ -11,4 +12,12 @@ def sprDop(x):
 #generator ppulacji
 def genP(x):
     for i in range(0,x):
-        pBadana.append(random.randint(1,127))
\ No newline at end of file
+        pBadana.append(random.randint(1,127))
+
+#let's start
+def engine():
+    genP(10)
+    for i in range(0,10):
+        print(str(sprDop(pBadana[i])))
+
+engine()
\ No newline at end of file

From 78a18c99f077bd26c712ba34c06fa2228876a2bb Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 23:07:26 +0100
Subject: [PATCH 6/8] dodane peracje bitoowe

---
 .idea/workspace.xml | 164 +++++++++++++++++++-------------------------
 genAl.py            |  46 ++++++++++++-
 2 files changed, 114 insertions(+), 96 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c6a052b..c7cbba7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="48cee0e6-d903-4fdb-87f1-e0c964037856" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/genAl.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/szukaj.py" beforeDir="false" afterPath="$PROJECT_DIR$/szukaj.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/genAl.py" beforeDir="false" afterPath="$PROJECT_DIR$/genAl.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -15,19 +14,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="server" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/server">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="zaliczenie.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/zaliczenie.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1185">
+            <state relative-caret-position="15">
               <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
@@ -39,7 +29,7 @@
       <file leaf-file-name="zal2.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/zal2.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1515">
+            <state relative-caret-position="410">
               <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
               <folding>
                 <element signature="e#14#27#0" expanded="true" />
@@ -51,7 +41,7 @@
       <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/szukaj.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
+            <state relative-caret-position="-30">
               <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
@@ -63,8 +53,8 @@
       <file leaf-file-name="genAl.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/genAl.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+            <state relative-caret-position="770">
+              <caret line="62" column="8" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
             </state>
           </provider>
         </entry>
@@ -72,7 +62,7 @@
       <file leaf-file-name="odrzucone.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/odrzucone.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="855">
+            <state relative-caret-position="605">
               <caret line="57" selection-start-line="57" selection-end-line="57" />
             </state>
           </provider>
@@ -81,7 +71,7 @@
       <file leaf-file-name="thr.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/thr.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
+            <state relative-caret-position="300">
               <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
               <folding>
                 <element signature="e#0#16#0" expanded="true" />
@@ -90,42 +80,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="cli.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cli.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="10" selection-start-line="10" selection-end-line="10" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="razdwatrzy.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-              <folding>
-                <element signature="e#0#16#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="serv.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/serv.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -203,8 +157,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.szukaj">
-    <configuration name="server" type="PythonConfigurationType" factoryName="Python" temporary="true">
+  <component name="RunManager" selected="Python.genAl">
+    <configuration name="genAl" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -216,7 +170,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/server" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/genAl.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -295,19 +249,19 @@
       <option name="MODULE_MODE" value="false" />
     </configuration>
     <list>
-      <item itemvalue="Python.server" />
       <item itemvalue="Python.zaliczenie" />
       <item itemvalue="Python.zal2" />
       <item itemvalue="Python.thr" />
       <item itemvalue="Python.szukaj" />
+      <item itemvalue="Python.genAl" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.genAl" />
         <item itemvalue="Python.szukaj" />
         <item itemvalue="Python.zal2" />
         <item itemvalue="Python.thr" />
         <item itemvalue="Python.zaliczenie" />
-        <item itemvalue="Python.server" />
       </list>
     </recent_temporary>
   </component>
@@ -434,7 +388,28 @@
       <option name="project" value="LOCAL" />
       <updated>1546902085708</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="poczatek lab 2. algorytmy genetyczne">
+      <created>1546966233610</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1546966233611</updated>
+    </task>
+    <task id="LOCAL-00018" summary="maly refactor">
+      <created>1546966251438</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1546966251438</updated>
+    </task>
+    <task id="LOCAL-00019" summary="narazie koniec, poczatek silnika programu">
+      <created>1546967493791</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1546967493791</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -482,7 +457,10 @@
     <MESSAGE value="PSI - lab1 -'The Beggining'" />
     <MESSAGE value="dziala rysowanie punkto, to sie mz eprzydac ;)" />
     <MESSAGE value="dziala wysowanie punktow! i wyznacza jakas droge!" />
-    <option name="LAST_COMMIT_MESSAGE" value="dziala wysowanie punktow! i wyznacza jakas droge!" />
+    <MESSAGE value="poczatek lab 2. algorytmy genetyczne" />
+    <MESSAGE value="maly refactor" />
+    <MESSAGE value="narazie koniec, poczatek silnika programu" />
+    <option name="LAST_COMMIT_MESSAGE" value="narazie koniec, poczatek silnika programu" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/serv.py">
@@ -806,56 +784,46 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/client.py" />
     <entry file="file:///System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/socket.py" />
-    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
+    <entry file="file://$PROJECT_DIR$/odrzucone.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#16#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="605">
+          <caret line="57" selection-start-line="57" selection-end-line="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/serv.py">
+    <entry file="file://$PROJECT_DIR$/cli.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
+        <state relative-caret-position="150">
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cli.py">
+    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
+        <state relative-caret-position="210">
+          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
           <folding>
-            <element signature="e#0#13#0" expanded="true" />
+            <element signature="e#0#16#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/zaliczenie.py">
+    <entry file="file://$PROJECT_DIR$/serv.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1185">
-          <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+        <state relative-caret-position="195">
+          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
           <folding>
-            <element signature="e#0#17#0" expanded="true" />
+            <element signature="e#0#13#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/thr.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
+        <state relative-caret-position="300">
           <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
           <folding>
             <element signature="e#0#16#0" expanded="true" />
@@ -863,16 +831,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/odrzucone.py">
+    <entry file="file://$PROJECT_DIR$/server">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="855">
-          <caret line="57" selection-start-line="57" selection-end-line="57" />
+        <state relative-caret-position="480">
+          <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/zaliczenie.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/zal2.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1515">
+        <state relative-caret-position="410">
           <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
           <folding>
             <element signature="e#14#27#0" expanded="true" />
@@ -882,7 +860,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/szukaj.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
+        <state relative-caret-position="-30">
           <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
@@ -892,8 +870,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/genAl.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        <state relative-caret-position="770">
+          <caret line="62" column="8" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
         </state>
       </provider>
     </entry>
diff --git a/genAl.py b/genAl.py
index 9ef1bc6..7d56a8c 100644
--- a/genAl.py
+++ b/genAl.py
@@ -5,7 +5,9 @@
 
 #sprawdzanie dopasowania
 def sprDop(x):
+    #print(x)
     if x <1 or x >127:
+        del pBadana[pBadana.index(x)]
         return 0
     return 2 * (pow(x,2) + 1)
 
@@ -13,11 +15,49 @@ def sprDop(x):
 def genP(x):
     for i in range(0,x):
         pBadana.append(random.randint(1,127))
+    pBadana.sort()
+
+#mutacja
+def mutant(x):
+    mutantGen = 1<< random.randint(0,7) #1 przesuwamy bitowo, losowa pomiedzy najstarszym a najmlodszym bitem
+    print("Mutant gen: " + str(mutantGen))
+    return x^mutantGen #exclusive or
+
+#krzyzowanie
+def cross(x,y):
+    locus = 7 - random.randint(0,7)
+    #tworzenie maski bitowej d przneoseznia loculusa
+    bMask = 0
+    for i in range(0,locus):
+        bMask = bMask | 1<< i
+    #wyluskanie elemntu do zmiany
+    tempX = x & bMask
+    tempY = y & bMask
+    negBMask = ~bMask
+    headX = x & negBMask
+    headY = y & negBMask
+
+    sumX = headX | tempY
+    sumY = headY | tempX
+    print(x)
+    print(sumX)
+
+
+#sterwanie mutacjami i kombinacjami
+def mutSteer():
+    for nbs, p in enumerate(pBadana):
+        pBadana[nbs] = mutant(p)
 
 #let's start
 def engine():
-    genP(10)
-    for i in range(0,10):
-        print(str(sprDop(pBadana[i])))
+    genP(5)
+    for i in range(1,20):
+        print("Nowa generacja " + str(i))
+        genP(10 - len(pBadana))
+        for probka in pBadana:
+            print(str(sprDop(probka)))
+        del pBadana[0:5]
+        mutSteer()
+        print("-------------------------")
 
 engine()
\ No newline at end of file

From dcf6e8d49bc558ad69e469179ca2e5ea06c6c57a Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Tue, 8 Jan 2019 23:28:07 +0100
Subject: [PATCH 7/8] koniec zad2

---
 genAl.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/genAl.py b/genAl.py
index 7d56a8c..30144af 100644
--- a/genAl.py
+++ b/genAl.py
@@ -20,7 +20,7 @@ def genP(x):
 #mutacja
 def mutant(x):
     mutantGen = 1<< random.randint(0,7) #1 przesuwamy bitowo, losowa pomiedzy najstarszym a najmlodszym bitem
-    print("Mutant gen: " + str(mutantGen))
+    #print("Mutant gen: " + str(mutantGen))
     return x^mutantGen #exclusive or
 
 #krzyzowanie
@@ -39,25 +39,33 @@ def cross(x,y):
 
     sumX = headX | tempY
     sumY = headY | tempX
-    print(x)
-    print(sumX)
-
+    pBadana[pBadana.index(x)] = sumX
+    pBadana[pBadana.index(y)] = sumY
 
 #sterwanie mutacjami i kombinacjami
 def mutSteer():
     for nbs, p in enumerate(pBadana):
         pBadana[nbs] = mutant(p)
+    for p in pBadana:
+        cross(p, pBadana[random.randint(0,len(pBadana)-1)])
 
 #let's start
 def engine():
     genP(5)
-    for i in range(1,20):
-        print("Nowa generacja " + str(i))
+    resultFlag = False
+    genNo = 0
+    while not resultFlag:
+        print("Generacja: " + str(genNo))
         genP(10 - len(pBadana))
         for probka in pBadana:
-            print(str(sprDop(probka)))
+            tempW = sprDop(probka)
+            if tempW == 32260:  #najwyzsze mozliwe dopasowanie
+                resultFlag = True
+            print(str(probka) + ": " + str(tempW))
         del pBadana[0:5]
-        mutSteer()
+        mutSteer()  #mutujemy tylko te które zostały w selekcji
         print("-------------------------")
+        genNo +=1
 
-engine()
\ No newline at end of file
+engine()
+print(sprDop(127))
\ No newline at end of file

From b12f5a291ef1c1c07d76c21d611d46467689da29 Mon Sep 17 00:00:00 2001
From: Wojtek Niedzielski <nwojtek@gmail.com>
Date: Wed, 30 Jan 2019 22:15:20 +0100
Subject: [PATCH 8/8] psi koniec

---
 .idea/workspace.xml | 266 ++++++++++++++------------------------------
 asia.py             |   5 +
 perceptron.py       |  84 ++++++++++++++
 3 files changed, 175 insertions(+), 180 deletions(-)
 create mode 100644 asia.py
 create mode 100644 perceptron.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c7cbba7..2c23d57 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="48cee0e6-d903-4fdb-87f1-e0c964037856" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/asia.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/perceptron.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/genAl.py" beforeDir="false" afterPath="$PROJECT_DIR$/genAl.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,68 +15,50 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="zaliczenie.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/zaliczenie.py">
+      <file leaf-file-name="genAl.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/genAl.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="525">
+              <caret line="35" column="21" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="zal2.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/zal2.py">
+      <file leaf-file-name="perceptron.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/perceptron.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="410">
-              <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
-              <folding>
-                <element signature="e#14#27#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-375">
+              <caret line="11" column="15" selection-start-line="9" selection-end-line="12" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/szukaj.py">
+      <file leaf-file-name="asia.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/asia.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-30">
-              <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="45">
+              <caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="genAl.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/genAl.py">
+      <file leaf-file-name="razdwatrzy.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="770">
-              <caret line="62" column="8" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="odrzucone.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/odrzucone.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="605">
-              <caret line="57" selection-start-line="57" selection-end-line="57" />
+            <state relative-caret-position="195">
+              <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+              <folding>
+                <element signature="e#0#16#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="thr.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/thr.py">
+      <file leaf-file-name="szukaj.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/szukaj.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
-              <folding>
-                <element signature="e#0#16#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="870">
+              <caret line="60" column="21" selection-start-line="49" selection-end-line="60" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -111,6 +94,8 @@
         <option value="$PROJECT_DIR$/zal2.py" />
         <option value="$PROJECT_DIR$/szukaj.py" />
         <option value="$PROJECT_DIR$/genAl.py" />
+        <option value="$PROJECT_DIR$/asia.py" />
+        <option value="$PROJECT_DIR$/perceptron.py" />
       </list>
     </option>
   </component>
@@ -128,7 +113,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -140,6 +124,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -157,8 +142,8 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.genAl">
-    <configuration name="genAl" type="PythonConfigurationType" factoryName="Python" temporary="true">
+  <component name="RunManager" selected="Python.perceptron">
+    <configuration name="asia" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -170,13 +155,13 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/genAl.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/asia.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
-    <configuration name="szukaj" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="genAl" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -188,13 +173,13 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/szukaj.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/genAl.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
-    <configuration name="thr" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="perceptron" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -206,13 +191,13 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/thr.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/perceptron.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
-    <configuration name="zal2" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="szukaj" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -224,44 +209,44 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zal2.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/szukaj.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
-    <configuration name="zaliczenie" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="zal2" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="LocalMessen" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="/Library/Frameworks/Python.framework/Versions/3.6/bin/python3.6" />
+      <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zaliczenie.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zal2.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
     <list>
-      <item itemvalue="Python.zaliczenie" />
       <item itemvalue="Python.zal2" />
-      <item itemvalue="Python.thr" />
       <item itemvalue="Python.szukaj" />
       <item itemvalue="Python.genAl" />
+      <item itemvalue="Python.asia" />
+      <item itemvalue="Python.perceptron" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.perceptron" />
+        <item itemvalue="Python.asia" />
         <item itemvalue="Python.genAl" />
         <item itemvalue="Python.szukaj" />
         <item itemvalue="Python.zal2" />
-        <item itemvalue="Python.thr" />
-        <item itemvalue="Python.zaliczenie" />
       </list>
     </recent_temporary>
   </component>
@@ -414,14 +399,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-2" y="48" width="1924" height="1036" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13751318" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50052685" side_tool="true" weight="0.37843785" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Python Console" order="7" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.24642465" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.2739274" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info id="Favorites" order="2" side_tool="true" />
@@ -463,26 +447,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="narazie koniec, poczatek silnika programu" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/serv.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/zal2.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1545">
-          <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
-          <folding>
-            <element signature="e#14#27#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/server">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="480">
@@ -494,9 +458,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="840">
           <caret line="56" column="6" selection-start-line="54" selection-end-line="85" selection-end-column="15" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -504,9 +465,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -524,9 +482,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -534,9 +489,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
           <caret line="28" column="25" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="25" />
-          <folding>
-            <element signature="e#14#27#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -551,9 +503,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1380">
           <caret line="92" column="27" lean-forward="true" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -561,9 +510,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -581,9 +527,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -591,9 +534,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="405">
           <caret line="29" column="18" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
-          <folding>
-            <element signature="e#14#27#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -608,9 +548,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -628,9 +565,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -638,9 +572,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1830">
           <caret line="126" column="5" lean-forward="true" selection-start-line="126" selection-start-column="5" selection-end-line="126" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -655,9 +586,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -675,9 +603,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -685,9 +610,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1350">
           <caret line="94" column="7" selection-start-line="94" selection-start-column="7" selection-end-line="94" selection-end-column="7" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -698,9 +620,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -718,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -741,9 +657,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="13" column="19" lean-forward="true" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -761,9 +674,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -784,30 +694,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/client.py" />
     <entry file="file:///System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/socket.py" />
-    <entry file="file://$PROJECT_DIR$/odrzucone.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="605">
-          <caret line="57" selection-start-line="57" selection-end-line="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/cli.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#16#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -815,19 +705,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/thr.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
+        <state relative-caret-position="285">
           <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#16#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -838,40 +722,62 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/zal2.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="27" column="19" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/odrzucone.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="769">
+          <caret line="57" selection-start-line="57" selection-end-line="57" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/zaliczenie.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
+        <state relative-caret-position="125">
           <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/zal2.py">
+    <entry file="file://$PROJECT_DIR$/szukaj.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="103" column="26" selection-start-line="103" selection-start-column="26" selection-end-line="103" selection-end-column="26" />
-          <folding>
-            <element signature="e#14#27#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="870">
+          <caret line="60" column="21" selection-start-line="49" selection-end-line="60" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/szukaj.py">
+    <entry file="file://$PROJECT_DIR$/genAl.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="525">
+          <caret line="35" column="21" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/asia.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-30">
-          <caret line="31" column="17" lean-forward="true" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
+        <state relative-caret-position="45">
+          <caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/razdwatrzy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
           <folding>
-            <element signature="e#0#13#0" expanded="true" />
+            <element signature="e#0#16#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/genAl.py">
+    <entry file="file://$PROJECT_DIR$/perceptron.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="770">
-          <caret line="62" column="8" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+        <state relative-caret-position="-375">
+          <caret line="11" column="15" selection-start-line="9" selection-end-line="12" selection-end-column="34" />
         </state>
       </provider>
     </entry>
diff --git a/asia.py b/asia.py
new file mode 100644
index 0000000..0c7ce8f
--- /dev/null
+++ b/asia.py
@@ -0,0 +1,5 @@
+imie = input("Podaj imie: ")
+if imie.upper() == "Asia".upper():
+    print(imie+" zdrwiej!")
+else:
+    print("Spierdalaj!")
\ No newline at end of file
diff --git a/perceptron.py b/perceptron.py
new file mode 100644
index 0000000..f80aae8
--- /dev/null
+++ b/perceptron.py
@@ -0,0 +1,84 @@
+class WspPR:
+    x=0
+    y=0
+    s=0
+    def __init__(self,x,y,s):
+        self.x = x
+        self.y = y
+        self.s = s
+
+def predictins(obj, weights):
+    activat = 0
+    activat += (obj.x * weights[1]) + (obj.y * weights[2]) + weights[0]
+    return 1 if activat >=0 else 0
+
+def trening(obj, learningRate,epoch):
+    weigh = [0.0,0.0,0.0]
+    for epochNumb in range(epoch):
+        errorSummary = 0.0
+        for objs in obj:
+            predictio = predictins(objs,weigh)
+            error = objs.s - predictio
+            errorSummary = error ** 2
+            weigh[0] = weigh[0] + learningRate * error
+            #print(weigh[0] + learningRate * error)
+            weigh[1] = weigh[1] + learningRate * error * objs.x
+            weigh[2] = weigh[2] + learningRate * error * objs.y
+        #print(": ".join([str(epochNumb),str(learningRate),str(errorSummary)]))
+        #print(weigh)
+    return weigh
+
+weights = [1,2,-1]
+wspNauczyciel = []
+wspTest = []
+
+wspNauczyciel.append(WspPR(2,7,0))
+wspNauczyciel.append(WspPR(3,3,1))
+wspNauczyciel.append(WspPR(3,12,0))
+wspNauczyciel.append(WspPR(100,250,0))
+wspNauczyciel.append(WspPR(19,50,0))
+wspNauczyciel.append(WspPR(10, -10, 1))
+wspNauczyciel.append(WspPR(5, 0, 1))
+wspNauczyciel.append(WspPR(100, 100, 1))
+wspNauczyciel.append(WspPR(12, 20, 1))
+wspNauczyciel.append(WspPR(-1,3,0))
+wspNauczyciel.append(WspPR(-6,-10,0))
+wspNauczyciel.append(WspPR(-3,0,0))
+wspNauczyciel.append(WspPR(10,101,0))
+wspNauczyciel.append(WspPR(10,23,0))
+
+wspTest.append(WspPR(-2,5,0))
+wspTest.append(WspPR(10,3,1))
+wspTest.append(WspPR(12,12,1))
+wspTest.append(WspPR(200,250,1))
+wspTest.append(WspPR(19,5,1))
+wspTest.append(WspPR(30, -10, 1))
+wspTest.append(WspPR(5, 4, 1))
+wspTest.append(WspPR(100,-100, 1))
+wspTest.append(WspPR(12, 50, 0))
+wspTest.append(WspPR(-1,-9,1))
+wspTest.append(WspPR(-6,10,0))
+wspTest.append(WspPR(-3,-10,1))
+wspTest.append(WspPR(1001,101,1))
+wspTest.append(WspPR(100,203,0))
+
+
+for objs in wspNauczyciel:
+    wynik = predictins(objs,weights)
+    if wynik == objs.s:
+        result = "PASS"
+    else:
+        result = "FAIL"
+    print(" ".join(["Wspolrzedne:",str(objs.x),str(objs.y),"oczekiwany",str(objs.s),"otrzymany",str(wynik),result]))
+
+weights = trening(wspNauczyciel,0.1,10)
+print(weights)
+print("--")
+for objs in wspTest:
+    wynik = predictins(objs, weights)
+    if wynik == objs.s:
+        result = "PASS"
+    else:
+        result = "FAIL"
+    print(" ".join(
+        ["Wspolrzedne:", str(objs.x), str(objs.y), "oczekiwany", str(objs.s), "otrzymany", str(wynik), result]))
\ No newline at end of file