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

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

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

From 537173bc70c795f4daee677aea9c69d11be728c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojtek.lukasik@yahoo.pl>
Date: Tue, 19 May 2020 13:14:19 +0200
Subject: [PATCH 02/10] dodanie decision tree

---
 .idea/workspace.xml                      |   31 +-
 Archiwum/frontend/js/main.js             | 1132 +++++++++++-----------
 __pycache__/data.cpython-37.pyc          |  Bin 0 -> 1657 bytes
 __pycache__/decision_tree.cpython-37.pyc |  Bin 0 -> 4767 bytes
 __pycache__/field.cpython-37.pyc         |  Bin 1367 -> 1383 bytes
 __pycache__/sweets.cpython-37.pyc        |  Bin 0 -> 471 bytes
 candy.py                                 |    9 +
 data.py                                  |   34 +-
 decision_tree.py                         |  184 ++++
 field.py                                 |    3 +
 main.py                                  |   26 +-
 11 files changed, 835 insertions(+), 584 deletions(-)
 create mode 100644 __pycache__/data.cpython-37.pyc
 create mode 100644 __pycache__/decision_tree.cpython-37.pyc
 create mode 100644 __pycache__/sweets.cpython-37.pyc
 create mode 100644 candy.py
 create mode 100644 decision_tree.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95a134d..e7d3537 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="828778c9-9d97-422f-a727-18ddbd059b85" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/decision_tree.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/functions.py" beforeDir="false" afterPath="$PROJECT_DIR$/functions.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Archiwum/frontend/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/Archiwum/frontend/js/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data.py" beforeDir="false" afterPath="$PROJECT_DIR$/data.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/field.py" beforeDir="false" afterPath="$PROJECT_DIR$/field.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -27,9 +29,14 @@
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/decision_tree.py" />
     <property name="restartRequiresConfirmation" value="false" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Studia\Projects\AL-2020" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -65,7 +72,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="main" type="PythonConfigurationType" factoryName="Python">
       <module name="wozek" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -87,9 +94,12 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="Python.main" />
+      <item itemvalue="Python.board" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.main" />
         <item itemvalue="Python.board" />
       </list>
     </recent_temporary>
@@ -108,7 +118,9 @@
       <workItem from="1589233530634" duration="769000" />
       <workItem from="1589543001064" duration="78000" />
       <workItem from="1589543305930" duration="10474000" />
-      <workItem from="1589561555146" duration="3374000" />
+      <workItem from="1589561555146" duration="3518000" />
+      <workItem from="1589727068958" duration="5729000" />
+      <workItem from="1589796372999" duration="4340000" />
     </task>
     <servers />
   </component>
@@ -120,15 +132,18 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
     </option>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/AL_2020$decision_tree.coverage" NAME="main Coverage Results" MODIFIED="1589815629629" 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$" />
-    <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589564478428" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/AL_2020$main.coverage" NAME="main Coverage Results" MODIFIED="1589729320403" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/wozek$main.coverage" NAME="main Coverage Results" MODIFIED="1589556038208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Archiwum/frontend/js/main.js b/Archiwum/frontend/js/main.js
index a0a8c6c..82a2d44 100644
--- a/Archiwum/frontend/js/main.js
+++ b/Archiwum/frontend/js/main.js
@@ -1,569 +1,569 @@
-//Klasy
-class Agent{
-    constructor(positionX, positionY, turn){
-        this.positionX = positionX;
-        this.positionY = positionY;
-        this.turn = turn;
-    }
-
-    getParams(){
-        let params = {};
-
-        positionX = this.positionX;
-        positionY = this.positionY;
-        turn = this.turn;
-
-        params = {positionX, positionY, turn};
-
-        return params;
-    }  
-
-    turnLeft(){
-        if(this.turn == 'Up'){
-            this.turn = 'Left';
-        }
-        else if(this.turn == 'Down'){
-            this.turn = 'Right';
-        }
-        else if(this.turn == 'Left'){
-            this.turn = 'Down';
-        }
-        else if(this.turn == 'Right'){
-            this.turn = 'Up'
-        }
-    }
-
-    turnRight(){
-        if(this.turn == 'Up'){
-            this.turn = 'Right';
-        }
-        else if(this.turn == 'Down'){
-            this.turn = 'Left';
-        }
-        else if(this.turn == 'Left'){
-            this.turn = 'Up';
-        }
-        else if(this.turn == 'Right'){
-            this.turn = 'Down'
-        }
-    }
-
-    showAgent(){
-        if(this.turn === "Up"){
-            document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Up.png')";
-        }
-        else if(this.turn === "Down"){
-            document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Down.png')";
-        }
-        else if(this.turn === "Right"){
-            document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Right.png')";
-        }
-        else if(this.turn === "Left"){
-            document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Left.png')";
-        }
-        
-    }
-
-    hideAgent(){
-        document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "";
-    }
-
-    goForward(){
-        this.hideAgent()
-        if(this.turn == 'Up'){
-            this.positionY += 1;
-        }
-        else if(this.turn == 'Down'){
-            this.positionY -= 1;
-        }
-        else if(this.turn == 'Left'){
-            this.positionX -= 1;
-        }
-        else if(this.turn == 'Right'){
-            this.positionX += 1;
-        }
-        this.showAgent()
-    }
-
-    goToField(field){
-        if(field.yField > this.positionY){
-            //pole jest nad agentem
-
-        }
-        if(field.yField < this.positionY){
-            //pole jest pod agentem
-
-        }
-        if(field.xField > this.positionX){
-            //pole jest na prawo
-
-        }
-        if(field.xField < this.positionX){
-            //pole jest na lewo
-
-        }
-    }
-
-
-}
-
-class Field{
-    constructor(x, y, isShelf, isOccupiedByAgent, costOfTravel){
-        this.xField = x;
-        this.yField = y;
-        this.isShelf = isShelf;
-        this.isOccupiedByAgent = isOccupiedByAgent;
-        this.costOfTravel = costOfTravel;
-        this.neighbors = [];
-        this.g = 0;
-        this.h = 0;
-        this.f = 0;
-        this.previous = undefined;
-    }
-
-    getParams(){
-        let params = {};
-
-        xField = this.xField;
-        yField = this.yField;
-        isShelf = this.isShelf;
-        isOccupiedByAgent = this.isOccupiedByAgent;
-        costOfTravel = this.costOfTravel;
-        params = {xField, yField, isShelf, isOccupiedByAgent, costOfTravel}
-
-        return params;
-    }
-	
-	setIsShelf(isShelf){
-		this.isShelf = isShelf;
-	}
-	
-	getIsShelf(){
-		return this.isShelf;
-	}
-	
-	setIsOccupiedByAgent(isOccupiedByAgent){
-		this.isOccupiedByAgent = isOccupiedByAgent;
-	}
-	
-	setCostOfTravel(costOfTravel){
-		this.costOfTravel = costOfTravel;
-    }
-    
-    setNeighbors(field){
-        if(field.isShelf == false){
-            this.neighbors.push(field)
-        }
-    }
-}
-
-class Shelf{
-	constructor(accessY, accessX, havePlace, box1, box2, box3){
-        this.accessX = accessX;
-        this.accessY = accessY;
-		this.havePlace = true;
-		this.box1 = box1;
-		this.box2 = box2;
-		this.box3 = box3;
-    }
-	
-	getParams(){
-        let params = {};
-
-        xField = this.xField;
-        yField = this.yField;
-		havePlace = this.havePlace;
-		box1 = this.box1;
-		box2 = this.box2;
-		box3 = this.box3;
-        params = {xField, yField, havePlace, box1, box2, box3}
-
-        return params;
-    }
-	
-	setbox1(box1){
-		this.box1 = box1;
-	}
-	
-	setbox2(box1){
-		this.box2 = box2;
-	}
-	
-	setbox3(box1){
-		this.box3 = box3;
-	}
-	
-	setHavePlace(havePlace){
-		this.havePlace = havePlace;
-	}
-}
-
-class Candy{
-	constructor(type, taste, mark, id){
-        this.type = type;
-		this.taste = taste;
-        this.mark = mark;
-		this.id = id;
-    }
-	
-	getId(){
-		return this.id;
-	}
-	
-}
-
-//funkcje
-
-function createBoard(rangeX, rangeY){
-    const board = [];
-
-    for(let y = 0; y < rangeY; y++){
-        const row = [];
-        for(let x = 0; x < rangeX; x++){
-            let field = new Field(x, y, false, false, 1);
-            row.push(field)
-        }
-        board.push(row)
-    }
-    return board
-}
-
-function createShelfOnBoard(board){
-	//pierwszy poziom
-	board[2][2].setIsShelf(true);
-	board[3][2].setIsShelf(true);
-	
-	board[2][4].setIsShelf(true);
-	board[3][4].setIsShelf(true);
-	
-	board[2][6].setIsShelf(true);
-	board[3][6].setIsShelf(true);
-	
-	board[2][8].setIsShelf(true);
-	board[3][8].setIsShelf(true);
-	
-	//drugi poziom
-	board[5][2].setIsShelf(true);
-	board[5][3].setIsShelf(true);
-	
-	board[5][7].setIsShelf(true);
-	board[5][8].setIsShelf(true);
-	
-	//trzeci poziom
-	board[7][2].setIsShelf(true);
-	board[8][2].setIsShelf(true);
-	
-	board[7][4].setIsShelf(true);
-	board[8][4].setIsShelf(true);
-	
-	board[7][6].setIsShelf(true);
-	board[8][6].setIsShelf(true);
-	
-	board[7][8].setIsShelf(true);
-	board[8][8].setIsShelf(true);
-	return board
-}
-
-function createCostofField(board, rangeX, rangeY){
-	let cost;
-	let number;
-	for(let y = 0; y < rangeY; y++){
-		for(let x = 0; x < rangeX; x++){
-			number = 0;
-			if(y<9 && board[y+1][x].getIsShelf()){
-				number = number + 1;
-			}
-			if(y>0 && board[y-1][x].getIsShelf()){
-				number = number + 1;
-			}
-			if(x<9 && board[y][x+1].getIsShelf()){
-				number = number + 1;
-			}
-			if(x>0 && board[y][x-1].getIsShelf()){
-				number = number + 1;
-			}
-			cost = number*2;
-			if(cost==0){
-				cost = 1;
-			}
-			board[y][x].setCostOfTravel(cost);
-		}
-	}
-	return board;
-}
-
-function createShelf(){
-	const listOfShelf = [];
-	
-	//pierwszy poziom
-	let shelf = new Shelf(2, 1, true, 211, 212, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(3, 1, true, 311, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(4, 4, false, 441, 442, 443);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(1, 4, true, 0, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(4, 6, true, 461, 462, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(1, 6, true, 161, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(3, 9, true, 391, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(2, 9, true, 291, 0, 0);
-	listOfShelf.push(shelf)
-	
-	//drugi poziom
-	shelf = new Shelf(5, 1, true, 511, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(5, 4, true, 541, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(5, 6, true, 561, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(5, 9, true, 591, 0, 0);
-	listOfShelf.push(shelf)
-	
-	//trzeci poziom
-	shelf = new Shelf(7, 1, true, 711, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(8, 1, true, 811, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(6, 4, true, 641, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(9, 4, true, 941, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(6, 6, true, 661, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(9, 6, true, 961, 0, 0);
-	listOfShelf.push(shelf)
-	
-	shelf = new Shelf(7, 9, true, 791, 0, 0);
-	listOfShelf.push(shelf)
-	shelf = new Shelf(8, 9, true, 891, 0, 0);
-	listOfShelf.push(shelf)
-	
-	
-	return listOfShelf;
-}
-
-function showBoard(board){
-    for(let y = board.length - 1; y >= 0 ; y--){
-        document.getElementById("board").innerHTML += "<div class='row' id='row-" + y + "'> </div>";
-
-        for(let x = 0; x < board[y].length; x++){
-			if(board[y][x].getIsShelf())
-				document.getElementById("row-" + y).innerHTML += "<div class='regal2' id=" + x + "-" + y + "> </div>"
-			else
-				document.getElementById("row-" + y).innerHTML += "<div class='field' id=" + x + "-" + y + ">"+ board[y][x].costOfTravel + "</div>"
-        }
-    }
-}
-
-function getDistance(field, goalField){
-    // var a = field.xField - goalField.xField;
-    // var b = field.yField - goalField.yField;
-    // var c = Math.sqrt(a*a + b*b);
-    var d = Math.abs(field.xField - goalField.xField) + Math.abs(field.yField - goalField.yField)
-    return d
-}
-
-function addNeighbors(board){
-    for(var y = 0; y < 10; y++){
-        for(var x = 0; x < 10; x++){
-            var leftNeigbor, rightNeighbor, topNeighbor, bottomNeighbor;
-            if(x > 0){
-                leftNeigbor = board[y][x - 1];
-                board[y][x].setNeighbors(leftNeigbor);
-            }
-            if(x < board[y].length - 1){
-                rightNeighbor = board[y][x + 1];
-                board[y][x].setNeighbors(rightNeighbor);
-            }
-            if(y > 0){
-                bottomNeighbor = board[y - 1][x];
-                board[y][x].setNeighbors(bottomNeighbor);
-            }
-            if(y < board.length - 1){
-                topNeighbor = board[y + 1][x];
-                board[y][x].setNeighbors(topNeighbor);
-            }
-        }
-    }
-}
-
-// function colorGreen(field){
-//     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "green";
+// //Klasy
+// class Agent{
+//     constructor(positionX, positionY, turn){
+//         this.positionX = positionX;
+//         this.positionY = positionY;
+//         this.turn = turn;
+//     }
+//
+//     getParams(){
+//         let params = {};
+//
+//         positionX = this.positionX;
+//         positionY = this.positionY;
+//         turn = this.turn;
+//
+//         params = {positionX, positionY, turn};
+//
+//         return params;
+//     }
+//
+//     turnLeft(){
+//         if(this.turn == 'Up'){
+//             this.turn = 'Left';
+//         }
+//         else if(this.turn == 'Down'){
+//             this.turn = 'Right';
+//         }
+//         else if(this.turn == 'Left'){
+//             this.turn = 'Down';
+//         }
+//         else if(this.turn == 'Right'){
+//             this.turn = 'Up'
+//         }
+//     }
+//
+//     turnRight(){
+//         if(this.turn == 'Up'){
+//             this.turn = 'Right';
+//         }
+//         else if(this.turn == 'Down'){
+//             this.turn = 'Left';
+//         }
+//         else if(this.turn == 'Left'){
+//             this.turn = 'Up';
+//         }
+//         else if(this.turn == 'Right'){
+//             this.turn = 'Down'
+//         }
+//     }
+//
+//     showAgent(){
+//         if(this.turn === "Up"){
+//             document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Up.png')";
+//         }
+//         else if(this.turn === "Down"){
+//             document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Down.png')";
+//         }
+//         else if(this.turn === "Right"){
+//             document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Right.png')";
+//         }
+//         else if(this.turn === "Left"){
+//             document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "url('img/Left.png')";
+//         }
+//
+//     }
+//
+//     hideAgent(){
+//         document.getElementById(this.positionX + "-" + this.positionY).style.backgroundImage = "";
+//     }
+//
+//     goForward(){
+//         this.hideAgent()
+//         if(this.turn == 'Up'){
+//             this.positionY += 1;
+//         }
+//         else if(this.turn == 'Down'){
+//             this.positionY -= 1;
+//         }
+//         else if(this.turn == 'Left'){
+//             this.positionX -= 1;
+//         }
+//         else if(this.turn == 'Right'){
+//             this.positionX += 1;
+//         }
+//         this.showAgent()
+//     }
+//
+//     goToField(field){
+//         if(field.yField > this.positionY){
+//             //pole jest nad agentem
+//
+//         }
+//         if(field.yField < this.positionY){
+//             //pole jest pod agentem
+//
+//         }
+//         if(field.xField > this.positionX){
+//             //pole jest na prawo
+//
+//         }
+//         if(field.xField < this.positionX){
+//             //pole jest na lewo
+//
+//         }
+//     }
+//
+//
 // }
-
-// function colorRed(field){
-//     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "red";
-// }
-
-// function colorYellow(field){
-//     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "yellow";
-// }
-
-const colorFactory = color => (field, animationFrame) => {
-    const delay = animationFrame * 50
-    console.log(delay)
-    setTimeout(() => {
-        document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = color;
-    }, delay);
-    return ++animationFrame
-}
-
-const colorYellow = colorFactory('yellow')
-const colorGreen = colorFactory('green')
-const colorRed = colorFactory('red')
-
-// function addNeighborsToOpenSet(set, neigbors){
-//     for(x = 0; x < neigbors.length; x++){
-//         set.push(neigbors[x]);
-//         colorGreen(neigbors[x]);
+//
+// class Field{
+//     constructor(x, y, isShelf, isOccupiedByAgent, costOfTravel){
+//         this.xField = x;
+//         this.yField = y;
+//         this.isShelf = isShelf;
+//         this.isOccupiedByAgent = isOccupiedByAgent;
+//         this.costOfTravel = costOfTravel;
+//         this.neighbors = [];
+//         this.g = 0;
+//         this.h = 0;
+//         this.f = 0;
+//         this.previous = undefined;
+//     }
+//
+//     getParams(){
+//         let params = {};
+//
+//         xField = this.xField;
+//         yField = this.yField;
+//         isShelf = this.isShelf;
+//         isOccupiedByAgent = this.isOccupiedByAgent;
+//         costOfTravel = this.costOfTravel;
+//         params = {xField, yField, isShelf, isOccupiedByAgent, costOfTravel}
+//
+//         return params;
+//     }
+//
+// 	setIsShelf(isShelf){
+// 		this.isShelf = isShelf;
+// 	}
+//
+// 	getIsShelf(){
+// 		return this.isShelf;
+// 	}
+//
+// 	setIsOccupiedByAgent(isOccupiedByAgent){
+// 		this.isOccupiedByAgent = isOccupiedByAgent;
+// 	}
+//
+// 	setCostOfTravel(costOfTravel){
+// 		this.costOfTravel = costOfTravel;
+//     }
+//
+//     setNeighbors(field){
+//         if(field.isShelf == false){
+//             this.neighbors.push(field)
+//         }
 //     }
 // }
-
-function addToClosedSet(set, field){
-    set.push(field);
-    colorRed(field);
-}
-
-
-function addToOpenSet(set, field){
-    set.push(field);
-    colorGreen(field);
-}
-
-function calculateFScore(field, goalField){
-    let fscore, distanceToGoal, costOfTravel;
-    distanceToGoal = getDistance(field, goalField);
-    costOfTravel = field.costOfTravel;
-    fscore = costOfTravel + distanceToGoal;
-    return fscore;
-}
-
-function findLowestFScore(openSet, goalField){
-    let bestField = openSet[0];
-    for(var x = 1; x < openSet.length; x++){
-        if(calculateFScore(openSet[x], goalField) < calculateFScore(bestField, goalField)){
-            bestField = openSet[x];
-        }
-    }
-    return bestField;
-}
-
-function removeFromSet(openSet, promisingField){
-    for(var x = openSet.length - 1; x >= 0; x--){
-        if(openSet[x] == promisingField){
-            openSet.splice(x,1);
-        }
-    }
-}
-
-function aStar(startField, goalField){
-    let closedSet = [];
-    let openSet = [];
-    var path;
-    let animationFrame = 0
-    
-    // addToOpenSet(openSet, startField)
-    openSet.push(startField);
-    colorGreen(startField, animationFrame);
-
-    while(openSet.length > 0){
-        
-        // let current = findLowestFScore(openSet, goalField);
-        let winner = 0;
-        for(let i = 0; i < openSet.length; i++){
-            if (openSet[i].f < openSet[winner].f){
-                winner = i
-            }
-        }
-
-        let current = openSet[winner];
-
-        if(current === goalField){
-            path = []
-            var temp = current;
-            path.push(temp);
-            while(temp.previous){
-                path.push(temp.previous);
-                temp = temp.previous
-            }
-            console.log("A* COMPLETED");
-
-            for(var i = 0; i < path.length; i++){
-                animationFrame = colorYellow(path[i], animationFrame);
-            }
-            return path;
-        }
-
-        removeFromSet(openSet, current);
-        // addToClosedSet(closedSet, current);
-        closedSet.push(current);
-        animationFrame = colorRed(current, animationFrame);
-        
-        var neighbors = current.neighbors;
-
-        for(var i = 0; i < neighbors.length; i++){        
-            var neighbor = neighbors[i];
-
-            if(!closedSet.includes(neighbor)){
-                var tempG = current.g + neighbor.costOfTravel;
-
-                if(openSet.includes(neighbor)){
-                    if(tempG < neighbor.g){
-                        neighbor.g = tempG;
-                    }
-                } else {
-                    neighbor.g = tempG;
-                    // addToOpenSet(openSet, neighbor);
-                    openSet.push(neighbor);
-                    animationFrame = colorGreen(neighbor,animationFrame);
-                }
-                neighbor.h = getDistance(neighbor, goalField);
-                neighbor.f = neighbor.g + neighbor.h;
-                
-                neighbor.previous = current;      
-            }
-        }
-    }
-}
-
-function executePath(agent, path){
-    
-}
-
-
-let board = createBoard(10,10);
-board = createShelfOnBoard(board);
-board = createCostofField(board, 10, 10);
-let candy = new Candy('zelek', 'truskawkowy', 'Jumbo', 541);
-let shelfs = createShelf();
-let agent = new Agent(0,0, 'Right');
-
-addNeighbors(board);
-
-function delayedFunction(func, index, time) {
-    setTimeout(() => func(), time * index);
-}
-
-function start(){
-    showBoard(board);
-    
-    // for (let i = 0; i<9; i++) {
-    //     delayedStep(agent, i);
-    // }
-    const path = aStar(board[0][0], board[9][9]);
-    // agent.showAgent();
-    console.log(path.reverse())
-}
-
-
-
+//
+// class Shelf{
+// 	constructor(accessY, accessX, havePlace, box1, box2, box3){
+//         this.accessX = accessX;
+//         this.accessY = accessY;
+// 		this.havePlace = true;
+// 		this.box1 = box1;
+// 		this.box2 = box2;
+// 		this.box3 = box3;
+//     }
+//
+// 	getParams(){
+//         let params = {};
+//
+//         xField = this.xField;
+//         yField = this.yField;
+// 		havePlace = this.havePlace;
+// 		box1 = this.box1;
+// 		box2 = this.box2;
+// 		box3 = this.box3;
+//         params = {xField, yField, havePlace, box1, box2, box3}
+//
+//         return params;
+//     }
+//
+// 	setbox1(box1){
+// 		this.box1 = box1;
+// 	}
+//
+// 	setbox2(box1){
+// 		this.box2 = box2;
+// 	}
+//
+// 	setbox3(box1){
+// 		this.box3 = box3;
+// 	}
+//
+// 	setHavePlace(havePlace){
+// 		this.havePlace = havePlace;
+// 	}
+// }
+//
+// class Candy{
+// 	constructor(type, taste, mark, id){
+//         this.type = type;
+// 		this.taste = taste;
+//         this.mark = mark;
+// 		this.id = id;
+//     }
+//
+// 	getId(){
+// 		return this.id;
+// 	}
+//
+// }
+//
+// //funkcje
+//
+// function createBoard(rangeX, rangeY){
+//     const board = [];
+//
+//     for(let y = 0; y < rangeY; y++){
+//         const row = [];
+//         for(let x = 0; x < rangeX; x++){
+//             let field = new Field(x, y, false, false, 1);
+//             row.push(field)
+//         }
+//         board.push(row)
+//     }
+//     return board
+// }
+//
+// function createShelfOnBoard(board){
+// 	//pierwszy poziom
+// 	board[2][2].setIsShelf(true);
+// 	board[3][2].setIsShelf(true);
+//
+// 	board[2][4].setIsShelf(true);
+// 	board[3][4].setIsShelf(true);
+//
+// 	board[2][6].setIsShelf(true);
+// 	board[3][6].setIsShelf(true);
+//
+// 	board[2][8].setIsShelf(true);
+// 	board[3][8].setIsShelf(true);
+//
+// 	//drugi poziom
+// 	board[5][2].setIsShelf(true);
+// 	board[5][3].setIsShelf(true);
+//
+// 	board[5][7].setIsShelf(true);
+// 	board[5][8].setIsShelf(true);
+//
+// 	//trzeci poziom
+// 	board[7][2].setIsShelf(true);
+// 	board[8][2].setIsShelf(true);
+//
+// 	board[7][4].setIsShelf(true);
+// 	board[8][4].setIsShelf(true);
+//
+// 	board[7][6].setIsShelf(true);
+// 	board[8][6].setIsShelf(true);
+//
+// 	board[7][8].setIsShelf(true);
+// 	board[8][8].setIsShelf(true);
+// 	return board
+// }
+//
+// function createCostofField(board, rangeX, rangeY){
+// 	let cost;
+// 	let number;
+// 	for(let y = 0; y < rangeY; y++){
+// 		for(let x = 0; x < rangeX; x++){
+// 			number = 0;
+// 			if(y<9 && board[y+1][x].getIsShelf()){
+// 				number = number + 1;
+// 			}
+// 			if(y>0 && board[y-1][x].getIsShelf()){
+// 				number = number + 1;
+// 			}
+// 			if(x<9 && board[y][x+1].getIsShelf()){
+// 				number = number + 1;
+// 			}
+// 			if(x>0 && board[y][x-1].getIsShelf()){
+// 				number = number + 1;
+// 			}
+// 			cost = number*2;
+// 			if(cost==0){
+// 				cost = 1;
+// 			}
+// 			board[y][x].setCostOfTravel(cost);
+// 		}
+// 	}
+// 	return board;
+// }
+//
+// function createShelf(){
+// 	const listOfShelf = [];
+//
+// 	//pierwszy poziom
+// 	let shelf = new Shelf(2, 1, true, 211, 212, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(3, 1, true, 311, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(4, 4, false, 441, 442, 443);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(1, 4, true, 0, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(4, 6, true, 461, 462, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(1, 6, true, 161, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(3, 9, true, 391, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(2, 9, true, 291, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	//drugi poziom
+// 	shelf = new Shelf(5, 1, true, 511, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(5, 4, true, 541, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(5, 6, true, 561, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(5, 9, true, 591, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	//trzeci poziom
+// 	shelf = new Shelf(7, 1, true, 711, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(8, 1, true, 811, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(6, 4, true, 641, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(9, 4, true, 941, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(6, 6, true, 661, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(9, 6, true, 961, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+// 	shelf = new Shelf(7, 9, true, 791, 0, 0);
+// 	listOfShelf.push(shelf)
+// 	shelf = new Shelf(8, 9, true, 891, 0, 0);
+// 	listOfShelf.push(shelf)
+//
+//
+// 	return listOfShelf;
+// }
+//
+// function showBoard(board){
+//     for(let y = board.length - 1; y >= 0 ; y--){
+//         document.getElementById("board").innerHTML += "<div class='row' id='row-" + y + "'> </div>";
+//
+//         for(let x = 0; x < board[y].length; x++){
+// 			if(board[y][x].getIsShelf())
+// 				document.getElementById("row-" + y).innerHTML += "<div class='regal2' id=" + x + "-" + y + "> </div>"
+// 			else
+// 				document.getElementById("row-" + y).innerHTML += "<div class='field' id=" + x + "-" + y + ">"+ board[y][x].costOfTravel + "</div>"
+//         }
+//     }
+// }
+//
+// function getDistance(field, goalField){
+//     // var a = field.xField - goalField.xField;
+//     // var b = field.yField - goalField.yField;
+//     // var c = Math.sqrt(a*a + b*b);
+//     var d = Math.abs(field.xField - goalField.xField) + Math.abs(field.yField - goalField.yField)
+//     return d
+// }
+//
+// function addNeighbors(board){
+//     for(var y = 0; y < 10; y++){
+//         for(var x = 0; x < 10; x++){
+//             var leftNeigbor, rightNeighbor, topNeighbor, bottomNeighbor;
+//             if(x > 0){
+//                 leftNeigbor = board[y][x - 1];
+//                 board[y][x].setNeighbors(leftNeigbor);
+//             }
+//             if(x < board[y].length - 1){
+//                 rightNeighbor = board[y][x + 1];
+//                 board[y][x].setNeighbors(rightNeighbor);
+//             }
+//             if(y > 0){
+//                 bottomNeighbor = board[y - 1][x];
+//                 board[y][x].setNeighbors(bottomNeighbor);
+//             }
+//             if(y < board.length - 1){
+//                 topNeighbor = board[y + 1][x];
+//                 board[y][x].setNeighbors(topNeighbor);
+//             }
+//         }
+//     }
+// }
+//
+// // function colorGreen(field){
+// //     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "green";
+// // }
+//
+// // function colorRed(field){
+// //     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "red";
+// // }
+//
+// // function colorYellow(field){
+// //     document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = "yellow";
+// // }
+//
+// const colorFactory = color => (field, animationFrame) => {
+//     const delay = animationFrame * 50
+//     console.log(delay)
+//     setTimeout(() => {
+//         document.getElementById(field.xField + "-" + field.yField).style.backgroundColor = color;
+//     }, delay);
+//     return ++animationFrame
+// }
+//
+// const colorYellow = colorFactory('yellow')
+// const colorGreen = colorFactory('green')
+// const colorRed = colorFactory('red')
+//
+// // function addNeighborsToOpenSet(set, neigbors){
+// //     for(x = 0; x < neigbors.length; x++){
+// //         set.push(neigbors[x]);
+// //         colorGreen(neigbors[x]);
+// //     }
+// // }
+//
+// function addToClosedSet(set, field){
+//     set.push(field);
+//     colorRed(field);
+// }
+//
+//
+// function addToOpenSet(set, field){
+//     set.push(field);
+//     colorGreen(field);
+// }
+//
+// function calculateFScore(field, goalField){
+//     let fscore, distanceToGoal, costOfTravel;
+//     distanceToGoal = getDistance(field, goalField);
+//     costOfTravel = field.costOfTravel;
+//     fscore = costOfTravel + distanceToGoal;
+//     return fscore;
+// }
+//
+// function findLowestFScore(openSet, goalField){
+//     let bestField = openSet[0];
+//     for(var x = 1; x < openSet.length; x++){
+//         if(calculateFScore(openSet[x], goalField) < calculateFScore(bestField, goalField)){
+//             bestField = openSet[x];
+//         }
+//     }
+//     return bestField;
+// }
+//
+// function removeFromSet(openSet, promisingField){
+//     for(var x = openSet.length - 1; x >= 0; x--){
+//         if(openSet[x] == promisingField){
+//             openSet.splice(x,1);
+//         }
+//     }
+// }
+//
+// function aStar(startField, goalField){
+//     let closedSet = [];
+//     let openSet = [];
+//     var path;
+//     let animationFrame = 0
+//
+//     // addToOpenSet(openSet, startField)
+//     openSet.push(startField);
+//     colorGreen(startField, animationFrame);
+//
+//     while(openSet.length > 0){
+//
+//         // let current = findLowestFScore(openSet, goalField);
+//         let winner = 0;
+//         for(let i = 0; i < openSet.length; i++){
+//             if (openSet[i].f < openSet[winner].f){
+//                 winner = i
+//             }
+//         }
+//
+//         let current = openSet[winner];
+//
+//         if(current === goalField){
+//             path = []
+//             var temp = current;
+//             path.push(temp);
+//             while(temp.previous){
+//                 path.push(temp.previous);
+//                 temp = temp.previous
+//             }
+//             console.log("A* COMPLETED");
+//
+//             for(var i = 0; i < path.length; i++){
+//                 animationFrame = colorYellow(path[i], animationFrame);
+//             }
+//             return path;
+//         }
+//
+//         removeFromSet(openSet, current);
+//         // addToClosedSet(closedSet, current);
+//         closedSet.push(current);
+//         animationFrame = colorRed(current, animationFrame);
+//
+//         var neighbors = current.neighbors;
+//
+//         for(var i = 0; i < neighbors.length; i++){
+//             var neighbor = neighbors[i];
+//
+//             if(!closedSet.includes(neighbor)){
+//                 var tempG = current.g + neighbor.costOfTravel;
+//
+//                 if(openSet.includes(neighbor)){
+//                     if(tempG < neighbor.g){
+//                         neighbor.g = tempG;
+//                     }
+//                 } else {
+//                     neighbor.g = tempG;
+//                     // addToOpenSet(openSet, neighbor);
+//                     openSet.push(neighbor);
+//                     animationFrame = colorGreen(neighbor,animationFrame);
+//                 }
+//                 neighbor.h = getDistance(neighbor, goalField);
+//                 neighbor.f = neighbor.g + neighbor.h;
+//
+//                 neighbor.previous = current;
+//             }
+//         }
+//     }
+// }
+//
+// function executePath(agent, path){
+//
+// }
+//
+//
+// let board = createBoard(10,10);
+// board = createShelfOnBoard(board);
+// board = createCostofField(board, 10, 10);
+// let candy = new Candy('zelek', 'truskawkowy', 'Jumbo', 541);
+// let shelfs = createShelf();
+// let agent = new Agent(0,0, 'Right');
+//
+// addNeighbors(board);
+//
+// function delayedFunction(func, index, time) {
+//     setTimeout(() => func(), time * index);
+// }
+//
+// function start(){
+//     showBoard(board);
+//
+//     // for (let i = 0; i<9; i++) {
+//     //     delayedStep(agent, i);
+//     // }
+//     const path = aStar(board[0][0], board[9][9]);
+//     // agent.showAgent();
+//     console.log(path.reverse())
+// }
+//
+//
+//
diff --git a/__pycache__/data.cpython-37.pyc b/__pycache__/data.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..90788d557c53ca70d1a55bc79d69a7a29fff6fd0
GIT binary patch
literal 1657
zcmb7^&u<$=6vub%-L)OtiPQ8)($FR}5Mo-FGzD5p+qh{|5NUo;BY{R1Fy0w9Td#M_
z>@KdY^hA5+UjT994?ya<e*q_o_QIj3RXGBOUf?^+Mu5^vu-2?T^WOKp8Nc`JwQ6-t
z!}I;Uhaa1u$7-|x%mJEM!Kb>WF^%b-*3*fuYb?j|_cW4Y1~Zw(3asduti;AxnN?U7
zJPy0!32+VeNoWp%r(i$Kj<BOCA7j(7&t&%F;8}19nrUcW$XMx5fNQXy1kYtW37!YP
znCVY}7qa{>fz??r;|`0N<`v{$N;PAwj@Vbhr=d}K&SZL(zX4WvIE&cVz$(Au<&@8{
z74Z4Y{yK8L0j{xg>`mA&WPB0)7I*>nOUU^)*vR-Y_;kis9MhR4d3Lp>)mIZ$_qrZi
ztpVp@V5_Zqa#$ADb*!L*Ryf*SEkrw18&nIvH1Fzr+SmG?{tcRwdD6B#$AeZK@RX5F
z#Z;c@QRh?-c*fZTzWO9P^bF6`b3KPs&yfQ$N3-v9?0{z)&78qG$N%lw(@?hAt=QP4
zG9YDp#Jj?yObmv^?9fp7#0n&5zU%z*{)3bEpX8gQv@fE>V9{vk{Jzxw>fvuwO;Qk!
z6g_|F+<&6Pi_KAfb8$0^oM<|8slCu7))o&!kCS4D`qWp4l|1S*IrO_o+N0in(w|mI
zIh0Y*rGu`L88&X`sN<H}Kd;8-hn#WGdGu}n%GjenR*AVu1?>^TiF(vQtMUA>TF*(<
z{@9}ZKKEHYN6OUmcBEjD9R|b<)Tn%?Ni`o&Ppw~Sx59|Iv<<~=4n_Og&Bn^|%5t00
zke=-i<C-lw4f#5@e~p=e$lwfKnr`H3`k4M7R!$b7N0B{hcjJ=8Nz`{do}5q30gB+s
zJUBKS;W1+Lp-Y%D<U6iItaqt&JAzpKNcK@mbJO*@G&Va@4E&@4U0Qr%bi9ZsD=N<F
zapp!nVy%hD4~OXN=Mj}WS%Q-kH++Hm$RJrzu_cvm*cedM{DXmeXH?#iu5a^3Uw9(9
zpwbmvzH4_8L5!QO@MCkZ>xO((*>HWvWup^uUywY8XH?j5!$y~eNq{)1s+COOMXU{6
zwo8*6YEx`=-4H_&5KBmuf)nc&=K=P{w&WtY1JP*w2A7gc(U8L4<&qR{(a$LNJREcz
z_4o*lCWWmigo!3IDy_L5^*!PKir+jj-Vxir`y+5vyJm;(7kqwOj<~%m20VG1=5K|P
z4mvnwIR75)jmFnhd;Z>+b~v?nm20bRpn&PWOgdg^JL9Uysq|gn`9uv%I#U056>vmc
Zyxha&dHgD_p#>N5s^p6&D*FHb{0Y|RyFCB^

literal 0
HcmV?d00001

diff --git a/__pycache__/decision_tree.cpython-37.pyc b/__pycache__/decision_tree.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5b41fddbf90b73b53fd4046cff5d588de6ac5353
GIT binary patch
literal 4767
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
H?e;$b%sk}v

literal 0
HcmV?d00001

diff --git a/__pycache__/field.cpython-37.pyc b/__pycache__/field.cpython-37.pyc
index bd80bce59b9eaa3afffebc93d6a8acb329320842..4e6a06c2cc7fcbf2505aae4b69d1894cdfb3764d 100644
GIT binary patch
delta 353
zcmcc4^_+{>iI<m)0SN4t9f~WS$UBFzW8$hnvvh_UhIrl*zAXL)0x3)j8G$_h8U`Rw
za3M%WsD=^B60TvXVNGKK$_d4bOx9+UVHBP0!C1)3l39|PJ9!6VuB9Z<@L$R<Rx!aP
zr74+-F#$#SS*gh-#W9XPx<&>@1~F-wsW~Zn1(mlr;^Q;(GE3s)*??M#RVK$U$xp6i
ziqsGSa*ITPgeGH=1c(hX5<*A;S-04daxzPDQ&l$qV#;IG0;#ygnv|bdl!C61H!&q8
zJ})&hJtHZ<s91gSB$m(!X^>g6AVLX5AdCjHK;{=Q0SOi$E(W=agNZ|qgBdKQ$y6i=
MlgH3F*`8Gb06xu6X#fBK

delta 320
zcmaFPb)AdXiI<m)0SHQ)_r>W=<ekIVG;vj+K?!db-va&=riF|(4Doz53_za1LIxmP
zu!a%J5~^XTVNGKK$_d5`Pc~$fVHBC{$5=S|C}WPC1kk`=iY`_$0hP%aiAA{qMfq8&
z$tA@x<@r^q*^>jABp8(@XEDi7?q&+t5CkeN5&;sLj78!gHb^&wkOZ=Bu_fhXmgJ@?
zZsuanW7GnvxW$^3pIDTFu8=n|B_%#DH8VXUDZi*#W%44H&<H7zSu!9(5kw%22D3os
i7cl_|79cKW0}>oe9MT-jU@=XmA_15@hQ`VMtP%i4Lqz%j

diff --git a/__pycache__/sweets.cpython-37.pyc b/__pycache__/sweets.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c1890e13459b48e17170ea71c4e4c1cde2d78a98
GIT binary patch
literal 471
zcmYk2%}N6?5XY132Wzni;uDCMJy=SQB2quVixi;;VOb2zCc<jJOj4v}Z}w$;1Fyb-
z50I;m;LVf&*;?r=^P8FM%w#4P?RJYn-tRu{KViQp*hm1U54HQiHB(IS74%hPOo<^&
zgA(WeBH;C*_5jc<<BDZMaV1tP3sivo(8t3Ut(`4nq>zxMx=W}%1ZrM0$!Y=eIsio-
zf<YaDp<?L52WjNPabcc(<O=Jw58Yx0+G?qNG&5DH(-@&1Js4_kXb%$-A_86d#!Le9
zb98l*58Yf<MSg3hkGga=KfgKdb$i|1HnVnS3!g|?O)4iPb+XNa@%Zms?yYy~Y;p$J
z69toEtfllVDaTVaACbQ+<@3B4t^XKm(+shN9XjIxsiol)(Zqw4H+CzR<~LN}lhgGT
JXH@kKWxr(KVm|-?

literal 0
HcmV?d00001

diff --git a/candy.py b/candy.py
new file mode 100644
index 0000000..186a58b
--- /dev/null
+++ b/candy.py
@@ -0,0 +1,9 @@
+
+
+class Candy:
+    def __init__(self, producent, type, price):
+
+        self.producent = producent
+        self.type = type
+        self.price = price
+
diff --git a/data.py b/data.py
index 8d55fcd..679b5d5 100644
--- a/data.py
+++ b/data.py
@@ -25,4 +25,36 @@ def createDataSweets():
     sweet = Sweets('Maoam', 'truskawkowy', 'guma', 'maly', 0.25)
     allProducts.append(sweet)
 
-    return  allProducts
\ No newline at end of file
+    return allProducts
+
+
+learning_data = [
+    # kolor, kształt, waga, rozmiar, nazwa
+    ['black', 'rectangle', 51, 'small', 'Mars'],
+    ['gold', 'pack', 100, 'big', 'Haribo'],
+    ['purple', 'rectangle', 100, 'big', 'Milka'],
+    ['brown', 'pack', 45, 'small', 'M&M'],
+    ['blue', 'rectangle', 50, 'medium', 'Bounty'],
+    ['blue', 'square', 40, 'small', 'Knoppers'],
+    ['blue', 'rectangle', 35, 'small', 'Milky-way'],
+    ['gold', 'rectangle', 40, 'medium', 'Twix'],
+    ['gold', 'rectangle', 50, 'medium', 'Prince-polo'],
+    ['brown', 'rectangle', 55, 'medium', 'Snickers'],
+    ['brown', 'rectangle', 45, 'medium', 'Lion'],
+    ['white', 'rectangle', 40, 'medium', 'Kinder-bueno'],
+    ['red', 'rectangle', 50, 'medium', 'Kit-kat'],
+    ['blue', 'rectangle', 115, 'big', 'Wedel'],
+    ['white', 'rectangle', 15, 'small', 'Krowka'],
+    ['red', 'pack', 70, 'medium', 'Skittles'],
+    ['orange', 'rectangle', 45, 'medium', 'Reeses'],
+    ['blue', 'rectangle', 55, 'medium', 'Oreo'],
+    ['gold', 'rectangle', 120, 'big', 'Ferrero-rocher'],
+    ['white', 'rectangle', 120, 'big', 'Rafaello'],
+    ['white', 'jar', 600, 'big', 'Nutella'],
+    ['white', 'rectangle', 25, 'small', 'Duplo'],
+    ['brown', 'jar', 500, 'big', 'GoOn'],
+    ['brown', 'jar', 470, 'big', 'Active Orzechowe'],
+    ['red', 'jar', 250, 'medium', 'Strawberry Jam'],
+    ['black', 'jar', 250, 'medium', 'Blackberry Jam'],
+    ['orange', 'jar', 250, 'medium', 'Peach Jam'],
+]
\ No newline at end of file
diff --git a/decision_tree.py b/decision_tree.py
new file mode 100644
index 0000000..1f6c05b
--- /dev/null
+++ b/decision_tree.py
@@ -0,0 +1,184 @@
+import data
+
+training_data = data.learning_data
+
+header = ['color', 'shape', 'weight', 'size', 'name']
+
+
+# funkcja która zwraca listę unikalnych wartości z każdej kolumny
+def uniqie_vals(rows, col):
+    return set([row[col] for row in rows])
+
+
+# zliczamy liczbę wystąpień danego typu w zestawie danych
+def class_counts(rows):
+    counts = {}  # label -> count
+
+    for row in rows:
+        name = row[-1]
+        if name not in counts:
+            counts[name] = 0
+        counts[name] += 1
+    return counts
+
+
+# funkcja do sprawdzania czy wartość jest wartością numeryczną
+def is_numeric(val):
+    return isinstance(val, int) or isinstance(val, float)
+
+
+# klasa do zadawania pytań
+class Question:
+    def __init__(self, column, value):
+        self.column = column
+        self.value = value
+
+    def match(self, example):
+        val = example[self.column]
+
+        if is_numeric(val):
+            return val >= self.value
+        else:
+            return val == self.value
+
+    def __repr__(self):
+        condition = '=='
+        if is_numeric(self.value):
+            condition = '>='
+        return "Is %s %s %s?" % (header[self.column], condition, str(self.value))
+
+
+def partition(rows, question):
+    """ podział zbioru informacji
+        dla każdego rzędu w zbiorze, sprawdź czy zgadza się z pytaniem, jeśli tak
+        dodaj do 'true' inaczej dodaj do 'false' """
+    true_rows, false_rows = [], []
+    for row in rows:
+        if question.match(row):
+            true_rows.append(row)
+        else:
+            false_rows.append(row)
+    return true_rows, false_rows
+
+
+def gini(rows):
+    """ Gini impurity is a measure of how often a randomly chosen element from
+    the set would be incorrectly labeled if it was randomly labeled according to
+    the distribution of labels in the subset. """
+
+    counts = class_counts(rows)
+    impurity = 1
+    for lbl in counts:
+        prob_of_lbl = counts[lbl] / float(len(rows))
+        impurity -= prob_of_lbl ** 2
+    return impurity
+
+
+def info_gain(left, right, current_uncertainty):
+    p = float(len(left)) / (len(left) + len(right))
+    return current_uncertainty - p * gini(left) - (1 - p) * gini(right)
+
+
+def find_best_split(rows):
+    """ znajdź najlepsze możliwe pytanie do zadania, sprawdzając wszystkie
+        właściwośći oraz licząc dla nich 'info_gain' """
+    best_gain = 0
+    best_question = None
+    current_uncertainty = gini(rows)
+    n_features = len(rows[0]) - 1
+
+    for col in range(n_features):
+        values = set([row[col] for row in rows])
+
+        for val in values:
+            question = Question(col, val)
+
+            true_rows, false_rows = partition(rows, question)
+
+            if len(true_rows) == 0 or len(false_rows) == 0:
+                continue
+
+            gain = info_gain(true_rows, false_rows, current_uncertainty)
+
+            if gain > best_gain:
+                best_gain, best_question = gain, question
+
+    return best_gain, best_question
+
+
+class Leaf:
+    def __init__(self, rows):
+        self.predicions = class_counts(rows)
+
+
+class DecisionNode:
+    def __init__(self, question, true_branch, false_branch):
+        self.question = question
+        self.true_branch = true_branch
+        self.false_branch = false_branch
+
+
+def build_tree(rows):
+    gain, question = find_best_split(rows)
+
+    if gain == 0:
+        return Leaf(rows)
+
+    true_rows, false_rows = partition(rows, question)
+
+    true_branch = build_tree(true_rows)
+
+    false_branch = build_tree(false_rows)
+
+    return DecisionNode(question, true_branch, false_branch)
+
+
+def print_tree(node, spacing=""):
+    if isinstance(node, Leaf):
+        print(spacing + "Predict", node.predicions)
+
+    else:
+        print(spacing + str(node.question))
+
+        print(spacing + '--> True:')
+        print_tree(node.true_branch, spacing + "  ")
+
+        print(spacing + '--> False:')
+        print_tree(node.false_branch, spacing + "  ")
+
+
+def classify(row, node):
+    if isinstance(node, Leaf):
+        return node.predicions
+
+    if node.question.match(row):
+        return classify(row, node.true_branch)
+    else:
+        return classify(row, node.false_branch)
+
+
+def print_leaf(counts):
+    probs = []
+    for lbl in counts.keys():
+        probs.append(lbl)
+    return probs
+
+
+# my_tree = build_tree(training_data)
+#
+# print_tree(my_tree)
+#
+# testing_data = [
+#     ['gold', 'rectangle', 50, 'medium', 'Name'],
+#     ['brown', 'rectangle', 55, 'medium', 'Snickers'],
+#     ['white', 'rectangle', 120, 'big', 'Name']
+# ]
+#
+# test = ['white', 'rectangle', 120, 'big', 'Name']
+#
+# # for row in testing_data:
+# #     print(print_leaf(classify(row, my_tree)))
+#
+# wynik = print_leaf(classify(test, my_tree))[0]
+# print(wynik)
+
diff --git a/field.py b/field.py
index 033612c..99ade93 100644
--- a/field.py
+++ b/field.py
@@ -21,6 +21,9 @@ class Field:
         self.f = 0
         self.previous = None
 
+        # Przedmiot, który podnosi agent
+        self.item = []
+
         # Te rzeczy są potrzebne do wyświetlenia pola
         self.image = pygame.image.load('img/Field.png')
         self.rect = self.image.get_rect()
diff --git a/main.py b/main.py
index 63bd66d..6a0a9cc 100644
--- a/main.py
+++ b/main.py
@@ -2,11 +2,13 @@ import pygame
 import functions
 import sys
 import time
+import decision_tree
+import data
 
 from agent import Agent
 from settings import Settings
 from board import create_board, draw_board
-from random import randint
+from random import randint, choice
 
 
 # Inicjalizacja programu i utworzenie obiektu ekrany
@@ -17,10 +19,11 @@ def run():
     pygame.display.set_caption("Inteligentny wózek widłowy")
     agent = Agent(screen, 50, 50, "Down")
     board = create_board(screen)
+    my_tree = decision_tree.build_tree(data.learning_data)
 
-    for row in board:
-        for field in row:
-            print(field.cost_of_travel)
+    # for row in board:
+    #     for field in row:
+    #         print(field.cost_of_travel)
 
     path = []
     next_step = None
@@ -41,7 +44,10 @@ def run():
                     agent.move_forward(board)
                     print(agent.x, agent.y)
                 elif event.key == pygame.K_SPACE:
-                    field = board[randint(0, 9)][randint(0, 9)]
+                    board[9][0].item = choice(data.learning_data)
+                    print("Wybrano: " + board[9][0].item[-1])
+                    board[9][0].item[-1] = 'Something'
+                    field = board[9][0]
                     if not field.is_shelf:
                         path = functions.a_star(board[agent.y][agent.x], field, board)
                         path.pop(len(path) - 1)
@@ -61,12 +67,14 @@ def run():
                         for field in row:
                             if not field.is_shelf:
                                 field.image = pygame.image.load('img/Field.png')
-                                for row in board:
-                                    for field in row:
-                                        print(field.g, field.h, field.f, field.previous)
+
             else:
                 functions.change_turn(agent, next_step)
-            print(agent.x, agent.y)
+
+        if board[agent.y][agent.x].item:
+            prediction = decision_tree.print_leaf(decision_tree.classify(board[agent.y][agent.x].item, my_tree))
+            print("Agent uważa, że przedmiot to: " + prediction[0])
+            board[agent.y][agent.x].item = []
 
         draw_board(board)
         agent.blitme()

From 734505ab3db2ee0cb0a09ad8d9e6f3f36cb22639 Mon Sep 17 00:00:00 2001
From: Tomek <zipoland@gmail.com>
Date: Tue, 19 May 2020 17:45:15 +0200
Subject: [PATCH 03/10] Dodanie podprojektu

---
 .idea/misc.xml                           |   2 +-
 .idea/wozek.iml                          |   2 +-
 __pycache__/agent.cpython-38.pyc         | Bin 0 -> 1981 bytes
 __pycache__/board.cpython-38.pyc         | Bin 0 -> 1475 bytes
 __pycache__/data.cpython-38.pyc          | Bin 0 -> 2169 bytes
 __pycache__/decision_tree.cpython-38.pyc | Bin 0 -> 4825 bytes
 __pycache__/field.cpython-38.pyc         | Bin 0 -> 1638 bytes
 __pycache__/functions.cpython-38.pyc     | Bin 0 -> 2998 bytes
 __pycache__/mcda.cpython-38.pyc          | Bin 0 -> 2384 bytes
 __pycache__/product.cpython-38.pyc       | Bin 0 -> 475 bytes
 __pycache__/settings.cpython-38.pyc      | Bin 0 -> 585 bytes
 __pycache__/shelf.cpython-38.pyc         | Bin 0 -> 600 bytes
 __pycache__/supply.cpython-38.pyc        | Bin 0 -> 1288 bytes
 __pycache__/sweets.cpython-38.pyc        | Bin 0 -> 491 bytes
 main.py                                  |   4 +-
 mcda.py                                  | 100 +++++++++++++++++++++++
 product.py                               |   7 ++
 supply.py                                |  64 +++++++++++++++
 18 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 __pycache__/agent.cpython-38.pyc
 create mode 100644 __pycache__/board.cpython-38.pyc
 create mode 100644 __pycache__/data.cpython-38.pyc
 create mode 100644 __pycache__/decision_tree.cpython-38.pyc
 create mode 100644 __pycache__/field.cpython-38.pyc
 create mode 100644 __pycache__/functions.cpython-38.pyc
 create mode 100644 __pycache__/mcda.cpython-38.pyc
 create mode 100644 __pycache__/product.cpython-38.pyc
 create mode 100644 __pycache__/settings.cpython-38.pyc
 create mode 100644 __pycache__/shelf.cpython-38.pyc
 create mode 100644 __pycache__/supply.cpython-38.pyc
 create mode 100644 __pycache__/sweets.cpython-38.pyc
 create mode 100644 mcda.py
 create mode 100644 product.py
 create mode 100644 supply.py

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 715ed69..adaa126 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (AL-2020)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (Projekt)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/wozek.iml b/.idea/wozek.iml
index a9742fc..904114b 100644
--- a/.idea/wozek.iml
+++ b/.idea/wozek.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.7 (AL-2020)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (Projekt)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/__pycache__/agent.cpython-38.pyc b/__pycache__/agent.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7eee4502453830eb1bf743e3b70ea701838e2741
GIT binary patch
literal 1981
zcmbVNPj4GV6rY)$U9Z<pY67%0Q2tcy!5{)cp&*1%QKN7{7NQD5k=2#s**Lqlcg^gk
zZ6e?32k1vgj;T2F1^5<o<&-nG9Dv`Ou^od_Au-ne_RX6&zj^P?+vlB?m55<{`p0jN
zZq*t4ohHk}!{k1mavh+U;v=@pzF|rz?-^6x&tjJ={*blhIo4UHPq;h;Cin4_n}CGD
zn(Ye3m3YQ>J>@Bhw^Y6g@b*<rg?I<5t|Gi^ssZMv@xLA<dDZv9FdrmKJP+`c6=2Gz
zEM`*y<WmnQrV<D#gM)9t;dO>NbQz9c%>63JYA2!crt$_;cut9@2CLdh{gie@Q$CX#
zVE6WMLKekM#o(IXIsXJ_pDVzHOvi(dF671}AGB9YQ1*3_<R+RFWm=_09zR`@kBqDi
zb#C}m!;efbIU4lFiSg5MZ;%){DtgL<gQSXe(yxrP*l>hS74(siM7Mn-%Ve~#Yj8k^
z1h_+{=}OO-ejTri4<3Bc-6<1YcDH(u6P*|RgYH&R4y$6){Z1EIGOW5dHLo@%M<$Hp
zG*7EI4zRU+4ZwIX`?YvWT<1+5iQ`p!Asch!J}1N3AbD{!*D*o9*a@<lQRci;!BIxY
z9q+WI_1nn3QCjI$nCe#mXI#_4)_VuUVgj-nC$v;jQ89kpbZ)qXmpicsV{$_Aq0noJ
zN`&Q`RwJOfgUct)ZL9I1xu>XfSl+T43C*^$<yG-aoOsG7J<27Rm5Z<e)jCG(OpN?C
z*~gu26;E>Gf1eHxDow?zDWhl7UX5NMg$?)`NjC}TvX;WFQ+>oEaNWQ{xdvc7;^ER0
z@Z)PP0}I>#l>`d;jtg*>1Pb}yEG;exl&Ec&mj6hCev<-uo8T>iTLg;?=yzy(Rlt!A
zLQ}$S!{%iXx0WKd#(i51*g=D2>R7fdWGF>@gLLmdKtk6UN=Q_UTzO~$-a5NUHt1#~
zW#~uFR$7bCL5OyOdd|?J>`XrAxnm7r`NHlc))#ZuOU60>j1{)v!AX_}Rfw5CWA*c2
zz{FGyoPS#H!Xbk+^AxpqwWqLko__WZPwh<RKU&WEP(0^0exbl><r(j#uk#a}ug>0i
zYq=KQ+8Nb9G#R(eFo<im{-ch&ddk114zPVrz2LG6(qFM;E2AB{@4z-IYFj2u%eXwC
zR@S6F4FYNg`c*(%*p6WQy`rbpzrU2`xOkkz`-Ogj#SdX#z7JshV=n%ZVwJBgq}GzO
ziPZqBtNeJ)mDDm#ryWu+%+ZzO*hFzWF4W<O<YpZIbl4lY6;0o!rhi8LF2Q>QcL^@P
tW-Cz#(^Q<4my+6ZD8kjy3maj>>Jg%C3S@KDW)pttT=<G|Y8zna{SBD|i|haZ

literal 0
HcmV?d00001

diff --git a/__pycache__/board.cpython-38.pyc b/__pycache__/board.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab288617061fb45a3d4b124d880e8442995832
GIT binary patch
literal 1475
zcmZuxzi%5i6ef8;bao`!O`J$-oHl5KphAEY2oeM^iXuRaOodT2&2mt4IP1}}q|=?m
zyC#;wo17`|(5bUM=HEz`4xNflw{}v84(XPm=zF|VY6m@mj~~Cs_wiAD<da5YmEm{q
z?>A3-E@OYt;Or-G@Bmx7g$5Y#i22luh);wsIAJTYCbn;LCdCo+IoRO5V7>z`)UbDf
zKW1HTf$?mo%M0(Z%(7uTND(`ahBAUaCtvk>*l%Eah%J4Mo&n1_a1daTFo}W(E3gU|
zpbiaa!Wyi@M{p4?!Ny=C7a7a=NF4EP_QP>*VYF=+%P?{7WVUA7(H30R4qVw_Er!Ud
zPzzenKJs!`3yi;;*R(rwbPYNkHWum-M=p-q<p@63Zcxj-(aOmxTs`GDTA3Yc`{aUl
zPdR6^Z!|}28@#0{qjqj<8~Y}%;GWbqH@@FzzZ&mvmG>9&jvCMz+dpyjg+}F3v%?J6
zZnF*>)eP_2Y_taL`%JK4&3HG*3_bq&h}JT~*B?eSt2K_x2r%lTRIPFRKM}Zwdb^xY
z+RORKp3|Sbo&Bll@UQK3#o`?v=;CKIU7>93j6t5xSUDw+75JWiiKVyXYiIcHtp9i_
zmP)78B!R9NJ|)c(Fa9E(5-T&m!X^h2Ugon>VsfjBH@M<W4i#^3#T(6vH<<Xv9WsFC
z(SoX5k@^0xF`Nv(O!sB9cY7KS7Di#ca8wu%WZ|XN#VEXautygoExdyYDcm*ly}pby
zse*&|XkK{3G%%8dJDm^0i7cGqBt$(sN<t{ya5|MS_>B-Ch~;pwzniGE;0Fbt7tMZ>
zW<jzSWGZ|nqpnxDX<tbh7tU@HD)3#SoT@giURWx5u3Cf~lb-Jw?<=N0LGs<Lhg-cT
zsZ?oi8^u(d^!Iz)G972hwD+w_Msl3>jOy*_yr|<cVI~7Z(BGEspkdtR>s(+x<8RrQ
zBPRZ_?I!x0{3iGKCU^O|sPj5vk2eL`8|YiM>-?fn*HQ7@<3fKTox6El$g3G%#w$5D
z*RP%nEl$`e!>e1L*}$-LIXzkKZZym$vTLcU7^61HTq8sKF3qQiid9hI^KwhKaGX;4
zFq5GA3{khHE@7wE$Y51gB9xR#)l530Y1ECd_thkUA0zoSl~GDBwud{f3)k{K{}&dt
BGavu}

literal 0
HcmV?d00001

diff --git a/__pycache__/data.cpython-38.pyc b/__pycache__/data.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..82c5772992f19063e8d47b9422f8399405315a29
GIT binary patch
literal 2169
zcmbVNO>^5s7?x~FvEzKWNk5W?HlcwMw{@Xk6iV8-ZKg1UB&DGPv*RJN)-H-_S!-5u
zTzk?}>6yO(!>PXj&hQ5~QAQUIaM6?-ABSAvSw)>DaRLnTtmfJGdER%|`|kVd?%-g*
zhUe06-+lb`kf!~tCflD$Oez?`nyzU~W4fm`bfW7T%dqTc8p$w&napB+Ea#Xk&-z(`
z4X{DrA=nij1}?&W0GbitQP>Z%L+o&ZkFYV=$5Z=J;0fS7G-J@bkYc4j23&;wIPheO
z4**XAznJPz08gj!UjkNZy^KAaOf|0{{!F6jXC?Ta0zM6migPB_tN3MLwTH9teHB>6
zSNOFApJV5NFQoR1h<ORP$j-6XVZWT>H-O&+o`(GjV!j1zq<9wibc(M!rZYjZ>>8WH
zc^a&;qLr@4DhDM!vR2xhhk>o8&z=l`g>e%j7(iMa?SU2|H7X@49S_Y1`iAy}zM+4K
zM5RoUqJ0>ot%oTfn(`UglTqso_Ao<i7{_pcjqJgU?#moZm_t22htvOaq=y+pV#l%0
z(VfhOwxT_rSc;5ADg#omySy$u%0#<E%o+`aPpm+4=DW_X?|*ar(bH^&<e!NsPQKOc
zIDgJmKmYcR(F*AkjuZ{Q<2-t*#3w78*~OEKspoLTnM~|`6=E&%AoMuN)u>N>wOHPx
zK9e24j-U<dJq!Bd94Umd71U|Fu4IOd-8pKxnd(n-k@+EK+;g6M)x6sO<gYnmE>b}o
z#Bf>->TKoy`?*p^s`N(|Z8o{jN*Pk1o_AXc*0RGOG6Qv89&0iW(dMa}SE_ddE`#bk
zUFXsl_F8qG2lY@it8lr;>tU7Ake+RJq7hqi8uC>&UrnL}hPq#8)XKV%DeC?De;65A
zfIc#79<}QvFS#93-|={S0cK(bI1W#$z>(nyj}fB@UCb1jt+@`d-l5X1iO6cUWD|#K
zF1lWwBAyg&KQ2Qj&BVLrwRn79`B@Fl+*X5FH$=-1JIL{;Eh>3DqsZKXFK|*ah^H~_
z=2f^(xlM8UAGF>3-NJ3@`Zg~&g(u?6iN}iX+I4sk<2_gSk=b5zL*5-&aDB#Qxz^&o
zh_bjw-M$4kEZ1om2k?`sBI98d!CJs(>omT#6|U}vxE?`d35lcN#Ja<Iz!82~auMH$
zs5^9vOUb1uOQeWPlDk7cq1^KX$=<_xe1w#fzNJ<O6OG4JSaZJB^o096s-GBdi)G*a
z0kB)VZintVpIVk(Zm)?pk2jO}E1{(A8W!nHy-OS2p&Kea&*%BuoZ4%O+P~3U{D(#p
zW;XPP`!<_B*li7G2iwzhde|L}X9wHUe0H(B8qh9wR}<R7_B5g$Y)><K&Z>qav&cXx
zo0P5W1CES!v?o+<v6+_bDh*bdYlkuiIw{?)m-;eC#qEWuRCBOyE6X92<-d-MJOQtz
zl8Nd_J}6t;NosY_<5c>t?<BRK2)FG)H4>R@BsbeYm+|;DTm&tc#cLp&J2s&IkKZrG
F)ZbDqCE5T0

literal 0
HcmV?d00001

diff --git a/__pycache__/decision_tree.cpython-38.pyc b/__pycache__/decision_tree.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..281b85f5dd1214adf2d56269daa48d8826ebd5ce
GIT binary patch
literal 4825
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
F{a@Ng<7of@

literal 0
HcmV?d00001

diff --git a/__pycache__/field.cpython-38.pyc b/__pycache__/field.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4413c808e154086f3e5fef156e8f5dd1f2486723
GIT binary patch
literal 1638
zcmZux&u<es6!!D{$Rtg=-L}wWmlbGL!Hz(1KwJ<)m5SI~v=ZVHMQf#FC!J(66YOc#
zR)d68&WJyuJ@Q{v+W*4WJ@ve|J?(p*CZvEPfAj43p8eVHbKZ11Er#vszkmO=-eBw>
z8Z0*t2Rqo!Jp{=lWUNPDp23v&IIusM^rZiRN&l4hJPEH^99&{7>&9S%*ZV3PCNx}b
z90xnt%|ismdLUVkOOX5n!zJ8uJzoYg#Bm@SGQw{to49n#2Cq_;$)t&y^F}uD+{JD_
zB2-W@!77djm50bHAJMA<M866VgQ|fTRuN)j#1JEgO-Z>ehbs=-lDr+~T`hkYuburU
z`8h?cRSZY#=j7k0;L6&>y@Da`J>C#EBtz0(R|B#->7>)qV@LndEFZ-;ZD<m$RBqwO
z!m*7Km6uA3qlJZYsS$?m&~BntB+0=nRZ{F7i@^w^?P^k(QWQf`>cOGPY%^EsXn(KJ
z#x^MLP#Fs&3;Py^HkxU5m=*`d`e~`AHk=)g22*8&bc(B4KPv{(Mk7@Ut&-CE4p(Z9
z^;B3>jGNXsNJ{&7EFBPp1SlY;BLXUkCS~argwIU>f}j5$>^|$iF-n{MOJu9_BH8c1
zRAy2Zv;LpD7^_LyA5wWA&G6_#q<LBjL906XF&@G<KksVB3%ylnLyMoR)>k}FPw4LF
zjcg+Aq;eAtEE7A!Vvea`-Z=`|l?=ME?@nj^y(}&DCWh)Qgc$VCWYc+SxQ&(#DQc?d
zkr+}pgOhemqjn^2k{sB`rb}}qBBVqlBusq0L&_b)t$K$4#BL!m=}kC#klva9t^XXL
zj`k-^zrXI^`jY?td->$Q$_KaqMV&9*&ctf5|HX3tvVW0}`+ov`#ZYoudwB)tTROvX
z1g+t&J*Z#GC6(#bC5b2wmh|OR)y7#H4rViz%b2@r*kG?1X!&(fIs+-i;z7iiXVwrH
zY{TtE{~b;?>PlUUzNQ)~*y0c7Hyo6#becKEYujR{@Xn3Syb2aa;az<fBT+__ZM{t8
zx`URc`~`3Kw!h{bArtq<`2<4^$(6x6%ym6?cH;)UksM#J5Vj@6w2%iG*=-@-9t^VD
zqkqM8eTQJ1;6A|@^*W0rtm%NHN<$Ag;?bSRi&}0L&#*xeq;7W_H~YOsZ1lWl@q#Mo
Js7KKD{s(y>UV8ul

literal 0
HcmV?d00001

diff --git a/__pycache__/functions.cpython-38.pyc b/__pycache__/functions.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e39b7f480b6125339589101927430b7a987dfa41
GIT binary patch
literal 2998
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
LR01!!7S#U(J|L-|

literal 0
HcmV?d00001

diff --git a/__pycache__/mcda.cpython-38.pyc b/__pycache__/mcda.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4a133b5fdd1c590041e86e23dc4b463c829f22fa
GIT binary patch
literal 2384
zcma)7Pj4JG6t_K|+1bs%g{Do?q-mR!(yc`4p|k}RXp<g#3P}AUv<g&{@o2Nz+1**s
zY(vq^h2;xy<B&tSAn^@)=R0ul35nBQ_y7n2zvs;+8$_je<mcyS``P}z-}5}3nW-?8
z&wl;otM8{6`<*(IrHsyf)bs}k#T1X(6Bh9Ss|zKRqoi_`r%K9KWmP%w>yDaI(`p9R
z*#lXpQGv0!1E=n)s(R}?R`=A~>I~M+A2{kPv~yNlP>b+JwlnyatactAN@`iHV3n^f
zs8zIObx~bHTTz$Q8rmtf{+QLS3~@SE<Az@!R-p~)QbU(SiNrLCSrRiOa8XwCjk^;E
zVav!yH&(_=`Z|dt7<G5QW8_ZUM`wSxnMKCY5hiqX&}l@&Ir4CZ1YuK?rmUkd!w?qB
zgdBQluODbE+Y5BfF>cxp;@EiYNHzOy<LopWA;;2jAzh$uqNevDa<&JcTSCu6<4P>E
z$0M5q+cj&GM>ZF>d)DTWO`+CGTlzfwXaYbllaM4<Acpf0HDP4h{08T32Wd*MeepBX
zmof6^_05mApQe#cw;u*CBHihRyW0<=w3T&}?ay_0FKT7m?N9|bl9#4TKAr^tijYVN
zWX3B;pI%3Q=#Zc*0*TUo)NJf#so_1tlOY{y=s`44QGWY$NH`3A2;l05-MFg(-)@jZ
z`XY>a6(Xc%<3c*^V6nReCFeQI#R6+_T~!>oQQxuso4J$oMIgBVOD-0f#Y+G$XG_0>
zwVIA;VW`QvXgomO(C?D%+IYZ@>NRxDY$M7xyPdGBRnQ5e1=v!XOMIG3)OoJohb^Ql
zjSJn3E^Lqc2-_)MAdd<sW6D`#h0LXrOAOMr(p$pq1S{OaD@wV@cqR~PvBc1FYI83y
z4P@@lvpcL1xR#5Syp>Mn&4D-Un*kVV-{{Rhl{cBQ0ncR42mFnm%BS+=;#@!=b8#+0
z;(u?M<GvT@))d0Z)**?;VSEoT>#HP=BY1<lM?|W5rji6YXh#|NZiA)mDm!hR<`UoV
zQ1AzaZ`7y4<7n3_BPu^n`|W!9$cy3o6WdWjO%UcR2=gG0pS(<>3Et2aDe;SeHB$I|
zg|Bh{M7w&TuZiX%Ef^O{f)c7_RSc!U3YIZq%K))>$i945aAMjC+ttFMguwH0t9PY$
z1?+N&RhC=e!axwCtlj!iNEnMYdnI%6Bj>DF&FQg0^4Pqg463=twXdXc;;3V$@b2N!
zQ2j7V?Xis)BuUg!$Zo!Ac+>FE@Vya67A>1uOD8i6n2nu$h&@tz!I+Su3c#w|2WX3E
zr@8(Z_7g8Fr5e3~7MKc7nXv&YIN%Y01LPk;)RKBN1Br5`1oXc#CUeKWz_*c{62Kfo
zsS5XSOyO;zWaT+1+G6^r+%05p1IbIEehWLL)M!*5jh<YyF&ZDug^!J~4<zyAt{d2O
za;4CJ<l>b?z_2$3gHna`0d(BMxeE%|`w0CSp<3;|?yb@sJ5C8Bw}$_qOvKK!0P5QS
zOy42#0g1a1#!YmylhwSs*Xg%+BCRP9#!n7oi~pXEUKpnxe68=%qW>^|Cfx0&(Kv{Y
zFe4?mjC;g+`(7f96iOS=D(pTqk6*Ggs?cXK%Rl@y#dE7RUH8&{lEg3T^P!G{EPAej
zEO<UX)aVY!2~CM+e@Xf#Y4kQ*PL6I(E+>wCOh*4+8w8G{Pe31*(l68(o;XJb625=<
OxBJU0`6YkZpZgbk!0#9U

literal 0
HcmV?d00001

diff --git a/__pycache__/product.cpython-38.pyc b/__pycache__/product.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..61b31f2bfaf6fc71e78505c5e14745004a8cb8de
GIT binary patch
literal 475
zcmY*U!AiqG5S`s5HWmva9{qtH><5TQp#^V6kX}M?3E7p_rcK;U1xs%BXL|A@`~t7J
z`U&1V`6jVYC%iX1o0+$7roCR55WCNhhj-*JE)K&(F$CNh=$15Tu?5~_L|Wcc-%D}-
zFC?lV;LbsYBB3dgT4=eY$kQHX{JL{zbG=T>G(gWj_{_s2z+HeUQIVobf<@(lW#xlC
zO%M?i=mcq=<+cvoEGbOwFB9i#-_19sA0V6T(XycBC9KcHZ|ul+kbW*lSMk&t>*8_p
zV(cnUXYts$MVS{d{5_dP85gb3LGfCLO3hdEQYlt*A&A6L^KDN5)*0+u*c<v+$<ioQ
zca>UV-HgvCN<FWWto>t;A<~#RAXc`5)d9!;L)p}mzG(76FYjS_pboFwCvJG^8=zm%
CL1Wth

literal 0
HcmV?d00001

diff --git a/__pycache__/settings.cpython-38.pyc b/__pycache__/settings.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..19a5bce1bfd962c41ae310e0232e76f0e9f0a643
GIT binary patch
literal 585
zcmY*VO;5r=5S?u+Rs<3af1(#|UW_3mka#h~gm7sZC)izRp|rSLR17!yGyV?$MX#PX
zbMvCJ{V+J2_jcayyiRw<&1M}at`46McMRZ5i{mg!^a$#b=oUC|wj;b7E^uQ6j_K3+
zzc5Jk2&zpaz-1g<gEMaIz%{u^9xJm)B2B}1rhMx87dqGOK0$SfINJgiOn%CZoXsuF
zfnc<W(V~p%=4P%=INf56gYGljbNb3&ztA!FKeS1!BIndSpN1mh_!9Coa2tgPL^uml
z*M7xZE7#tXS=La#6e2F_vu3F(!{ZG7Bub>iGE0eQ`T^3WUf-SmwKrBmDsM1(7BWu!
zz#9m)NRyR!FO#`gq@F6L(OGRW8!?Q-6j4t?wTOV#%GF{m_I6Rtu2WSG^+XZl$x<L@
zb;M=D*OAT}h)?TDRNP2Chy16G=uDsK!D}ep(`LCII>mletKTEFA+v9a7G3Q+5a1V`
C$AsGe

literal 0
HcmV?d00001

diff --git a/__pycache__/shelf.cpython-38.pyc b/__pycache__/shelf.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..16977edb6d52515d580b8de86f1d43743dbf7352
GIT binary patch
literal 600
zcmZWm%}T>S5T4!q7^{_@#TN)dZ(c;C(1N!jgkC~$3E8!OX&ZM_rKLCfAbRXGc=RoD
z_2k)`Cug>l795ywb}~EPd^_pY>oq{T`uTkL!1zVUp*fhe(9Jo51j%xU;SMC1&Kjii
z%3~&31flzlb?9b<hsH5!p_>Z?1$Y}`E}7(Oh#l!j7o#gZWbi958mRm+qn4e~nY@i|
z8VD=40s(zMM5+ijtQ+!*4`me;dM4*tX)t#U5@{FjZ$KYm_`PgjCq1LINjmAX($iTs
zNIJ@l%UO}!>)A++%f!(5X0fOOA%@doDTGgBi3XU@mS<L9b65N)ly<cj3L|)9EB4M9
z?kxgM)sSlsL*=JMp{5d3nh<;DMXAyX-9kW@YN?bcjow86$k@HGWn-&iU+jh+DW0Yi
zB}7#dVuC$6olk{$ny2};qK}b8pAgVS4uGa<VyBnd=LS4*?HAmoUo84aZPSA$%VBi}
OH`{@?jM|AOaQ*<vMtMyD

literal 0
HcmV?d00001

diff --git a/__pycache__/supply.cpython-38.pyc b/__pycache__/supply.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..39dde2d4754e0e516dc190d27abbb10cf45b82f3
GIT binary patch
literal 1288
zcmcgsOK;RL5VrH$HoMygEU+z)^5~(FfCC(m5UP+`ajcL~B~-1bvKeceZn6n>LaDSp
z!4H8O{0{yD2VXdF@|{yp%q&H!REHy$Jn?+~{CQ^N$!@nBG8~&fzP;JN)lYKH4+ov+
zI8`4FFyI->`5xyC9B@CfJqNs3Eb<NRvWV-}OIbjjR0;Wi2Wj{?w{WU2=#AJ3t5AzH
z!295x@G1Mmr~EVO{sZ?RfELVM;LoFu4G)puw&-_|--U$>IvrSqr3U`81@}>B$)ZEJ
zO+Q5Zl7&xr+k#(i(C;<qQ(jjr^&y?BmiT*EpKF$T`^dM&L;AM(Dc_Zbd+qotTyNmt
zu*4a{D%`a23BP5*dx)=D^5PA6--b^azU$jN+8<_dGS>4_Bvm{aWx_nhXRLjd$62Pm
zQIUc6N~9Pd+#RMP9h9{!Gl6GiaWpXxXu}(3wJ?up8RP=eI@f`ETgOtE4Ft_SGEZpR
zKRQS&p<OA!C_)#>yr8Y1kQjq7@5ylwW0}6jb}}pIroT9v?`X^^x{)KP?Q{^ArI<kE
z=r+cC)}2bX%0GSjmC3tEJH5a4bg-+0RD<pKosg3vIT&mUHLi+sfQJsnxEiRsEVJW>
z<+1K1QpA<mhq#LO&y<vhI;uj$xaTbJkpIW&$aTDTCvxQ-{LV6;A+zMp87i`#dzRxr
ODifPnE2gMQ9rrgvHzBG3

literal 0
HcmV?d00001

diff --git a/__pycache__/sweets.cpython-38.pyc b/__pycache__/sweets.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8bdc65f92a1211cf024a2a0a3715987baf4934da
GIT binary patch
literal 491
zcmY+A%}T>S5XWaXAH-r2#3%3;klwtANTCI9MJT<5;1aSc#-vT$-6}1)*_ZJ-y!Qe2
z>Lc{#$(htbo$&w7&SqwIXJ`F>574f6Uyob#-xM61hrtkK&Jp(@L9z|%gC`*Q6k;#O
z{eQ+W8lubvLP5eLBwRAdH;{PJ!y4a((|4t;$wN#z7_F&xgff?imbD<D<w(|gNZ$HL
zuMLpC1nk5nap3%Urb`#t%vj}oyK0c8SSuGay2w==VyLPoP0cmUqkTd^phG`FN9ca8
zMmOoqC~eYl_NMfr&Y#n<GNrAX^g-7zs<f%;?mcK$E)t?x6jli8Xu3ya;orAD+s`*R
z<V<j8ELdc7C4}n<F|XyaqV=f|ugk33|IyT@yUY<zXpbRChK7iE7f)i=`J-H#LsNl^
MZudvrQPmCwzj>Qy0{{R3

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index f71fa65..8cc46c1 100644
--- a/main.py
+++ b/main.py
@@ -9,7 +9,7 @@ from agent import Agent
 from settings import Settings
 from board import create_board, draw_board
 from random import randint, choice
-
+from mcda import choseProducts
 
 # Inicjalizacja programu i utworzenie obiektu ekrany
 def run():
@@ -21,6 +21,8 @@ def run():
     board = create_board(screen)
     my_tree = decision_tree.build_tree(data.learning_data)
 
+    produsctsFromSupply = choseProducts(5)
+
     # for row in board:
     #     for field in row:
     #         print(field.cost_of_travel)
diff --git a/mcda.py b/mcda.py
new file mode 100644
index 0000000..742828c
--- /dev/null
+++ b/mcda.py
@@ -0,0 +1,100 @@
+from supply import *
+
+allProducts = create_data_products()
+
+color = {'black': 16, 'gold': 10, 'purple': 5, 'brown': 7, 'blue': 12, 'white': 14, 'red': 13, 'orange': 11}
+shape = {'rectangle': 15, 'pack': 19, 'square': 9, 'jar': 7}
+size = {'small': 7, 'medium': 16, 'big': 13}
+
+def sizeValue(X):
+    if X.size == 'small':
+        return X.mass/5
+    if X.size == 'medium':
+        return X.mass/10
+    if X.size == 'big':
+        return X.mass/20
+parameters = {
+    'color': {'weights': 3, 'q': 1, 'p': 5},
+    'shape': {'weights': 4, 'q': 1, 'p': 6},
+    'mass': {'weights': 0.5, 'q': 2, 'p': 10},
+    'size': {'weights': 1, 'q': 1, 'p': 8}
+
+}
+def getConcordance(gA, gB, q, p):
+    if gB <= gA + q:
+        return 1
+    if gB <= gA + p:
+        return (p - gB + gA) / (p - q)
+    return 0
+
+def getAllTypeConcordance(A, B):
+    concordance = 0.0
+    weight_sum = 0
+
+    parameter = parameters['color']
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']
+    concordance += getConcordance(color[A.color], color[B.color], q, p) * w
+    weight_sum += w
+
+    parameter = parameters['shape']
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']
+    concordance += getConcordance(shape[A.shape], shape[B.shape], q, p) * w
+    weight_sum += w
+
+    parameter = parameters['mass']
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']
+    concordance += getConcordance(sizeValue(A), sizeValue(B), q, p) * w
+    weight_sum += w
+
+    parameter = parameters['size']
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']
+    concordance += getConcordance(size[A.size], size[B.size], q, p) * w
+    weight_sum += w
+
+    concordance /= weight_sum
+    return concordance
+
+def getConcordanceAllProducts():
+
+    C = []
+
+    for i in range(len(allProducts)):
+        c = 0
+        for j in range(len(allProducts)):
+            if j==i:
+                continue
+            else:
+                c += getAllTypeConcordance(allProducts[i], allProducts[j])
+        c /= len(allProducts)-1
+        C.append(c)
+    return C
+
+def choseProducts(number):
+    C = getConcordanceAllProducts()
+    products = []
+    prev = -1
+    if number > len(allProducts):
+        return allProducts
+    while number > 0:
+        max = -1
+        if prev == -1:
+            max = 0
+        for j in range(len(allProducts)):
+            if prev == -1:
+                if C[max]<C[j]:
+                    max = j
+            elif max == -1:
+                if C[prev]>C[j]:
+                    max = j
+            elif C[max] < C[j] and C[j] < C[prev]:
+                max = j
+        prev = max
+        for j in range(len(allProducts)):
+            if C[max] == C[j]:
+                products.append(allProducts[j])
+                print(C[j])
+                number -= 1
+            if number == 0:
+                break
+    print(C)
+    return products
\ No newline at end of file
diff --git a/product.py b/product.py
new file mode 100644
index 0000000..e2acbe5
--- /dev/null
+++ b/product.py
@@ -0,0 +1,7 @@
+class Product:
+
+    def __init__(self, color, shape, mass, size):
+        self.color = color
+        self.shape = shape
+        self.mass = mass
+        self.size = size
\ No newline at end of file
diff --git a/supply.py b/supply.py
new file mode 100644
index 0000000..673b31a
--- /dev/null
+++ b/supply.py
@@ -0,0 +1,64 @@
+from product import Product
+
+
+def create_data_products():
+    allProducts = []
+
+    product = Product('black', 'rectangle', 51, 'small')
+    allProducts.append(product)
+    product = Product('black', 'rectangle', 51, 'small')
+    allProducts.append(product)
+    product = Product('gold', 'pack', 100, 'big')
+    allProducts.append(product)
+    product = Product('purple', 'rectangle', 100, 'big')
+    allProducts.append(product)
+    product = Product('brown', 'pack', 45, 'small')
+    allProducts.append(product)
+    product = Product('blue', 'rectangle', 50, 'medium')
+    allProducts.append(product)
+    product = Product('blue', 'square', 40, 'small')
+    allProducts.append(product)
+    product = Product('blue', 'rectangle', 35, 'small')
+    allProducts.append(product)
+    product = Product('gold', 'rectangle', 40, 'medium')
+    allProducts.append(product)
+    product = Product('gold', 'rectangle', 50, 'medium')
+    allProducts.append(product)
+    product = Product('brown', 'rectangle', 55, 'medium')
+    allProducts.append(product)
+    product = Product('brown', 'rectangle', 45, 'medium')
+    allProducts.append(product)
+    product = Product('white', 'rectangle', 40, 'medium')
+    allProducts.append(product)
+    product = Product('red', 'rectangle', 50, 'medium')
+    allProducts.append(product)
+    product = Product('blue', 'rectangle', 115, 'big')
+    allProducts.append(product)
+    product = Product('white', 'rectangle', 15, 'small')
+    allProducts.append(product)
+    product = Product('red', 'pack', 70, 'medium')
+    allProducts.append(product)
+    product = Product('orange', 'rectangle', 45, 'medium')
+    allProducts.append(product)
+    product = Product('blue', 'rectangle', 55, 'medium')
+    allProducts.append(product)
+    product = Product('gold', 'rectangle', 120, 'big')
+    allProducts.append(product)
+    product = Product('white', 'rectangle', 120, 'big')
+    allProducts.append(product)
+    product = Product('white', 'jar', 600, 'big')
+    allProducts.append(product)
+    product = Product('white', 'rectangle', 25, 'small')
+    allProducts.append(product)
+    product = Product('brown', 'jar', 500, 'big')
+    allProducts.append(product)
+    product = Product('brown', 'jar', 470, 'big')
+    allProducts.append(product)
+    product = Product('red', 'jar', 250, 'medium')
+    allProducts.append(product)
+    product = Product('black', 'jar', 250, 'medium')
+    allProducts.append(product)
+    product = Product('orange', 'jar', 250, 'medium')
+    allProducts.append(product)
+
+    return allProducts
\ No newline at end of file

From 12cfca95bc9cd8606d28dec58baa5ccbeb753eb3 Mon Sep 17 00:00:00 2001
From: Tomek <zipoland@gmail.com>
Date: Tue, 19 May 2020 19:42:55 +0200
Subject: [PATCH 04/10] Dodanie raportu do podprojektu

---
 Raport_444420.md                  | 159 ++++++++++++++++++++++++++++++
 __pycache__/mcda.cpython-38.pyc   | Bin 2384 -> 2384 bytes
 __pycache__/supply.cpython-38.pyc | Bin 1288 -> 1288 bytes
 mcda.py                           |   1 -
 4 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 Raport_444420.md

diff --git a/Raport_444420.md b/Raport_444420.md
new file mode 100644
index 0000000..01c7b80
--- /dev/null
+++ b/Raport_444420.md
@@ -0,0 +1,159 @@
+# Tomasz Kuczyński Raport - mcda
+
+### Opis podprojektu
+Podprojekt ma za zadanie wybrać określoną liczbę najlepszych produktów z dostawy.
+Wykorzystuj on zmodyfikowaną motodę MCDA - Multiple Criteria Decision Analysis.
+
+#### Uczenie modelu
+Zbiór uczenia składa się z zdefiniowania wartości atrybutów:
+
+```javascript
+color = {'black': 16, 'gold': 10, 'purple': 5, 'brown': 7, 'blue': 12, 'white': 14, 'red': 13, 'orange': 11}  
+shape = {'rectangle': 15, 'pack': 19, 'square': 9, 'jar': 7}  
+size = {'small': 7, 'medium': 16, 'big': 13}
+```
+oraz ich wyliczenia:
+```javascript
+def sizeValue(X):  
+  if X.size == 'small':  
+        return X.mass/5  
+  if X.size == 'medium':  
+        return X.mass/10  
+  if X.size == 'big':  
+        return X.mass/20
+```
+
+Składa się róznierz z parametrów:
+`weights` - waga danego parametru
+`q` - współczynik pomyłki (granicy błędu) pomiędzy atrybutami
+`p` - maksymalna dopuszczalna różnica pomiędy atrybutami 
+
+```javascript
+parameters = {  
+  'color': {'weights': 3, 'q': 1, 'p': 5},  
+  'shape': {'weights': 4, 'q': 1, 'p': 6},  
+  'mass': {'weights': 0.5, 'q': 2, 'p': 10},  
+  'size': {'weights': 1, 'q': 1, 'p': 8}
+}
+```
+
+#### Opis kodu w wspólnym projekcie
+W wspólnym projekcie w pliku main.py wywołuje funkcję wybierania 5 produktów z dostawy:
+
+```javascript
+produsctsFromSupply = choseProducts(5)
+```
+
+próbna dostawa jest zapisana w pliku supply.py:
+
+```javascript
+def create_data_products():  
+    allProducts = []  
+  
+    product = Product('black', 'rectangle', 51, 'small')  
+    allProducts.append(product)  
+    product = Product('black', 'rectangle', 51, 'small')  
+    allProducts.append(product)  
+    product = Product('gold', 'pack', 100, 'big')  
+    allProducts.append(product)
+    ...
+    return allProducts
+
+```
+
+Cały algorytm selekcji produktów znajduje się w pliku mcda.py.
+
+Funkcja `getConcordance(gA, gB, q, p):` ma za zadanie wyliczyć `Concordance` czyli jakość produktu A względem produktu B,  za pomocą wartości atrybutów A, B odpowiednio gA, gB oraz parametrów tego atrybutu q, p i zwrócić liczbę z zakresu [0,1].
+
+```javascript
+def getConcordance(gA, gB, q, p):  
+  if gB <= gA + q:  
+        return 1  
+  if gB <= gA + p:  
+        return (p - gB + gA) / (p - q)  
+    return 0
+```
+
+Funkcja `getAllTypeConcordance(A, B)`  ma za zadanie wyliczyć wszystkie typy `Concordance`  oraz wyliczyć ich średnią ważoną:
+
+```javascript
+def getAllTypeConcordance(A, B):  
+    concordance = 0.0  
+    weight_sum = 0  
+  
+    parameter = parameters['color']  
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']  
+    concordance += getConcordance(color[A.color], color[B.color], q, p) * w  
+    weight_sum += w  
+  
+    parameter = parameters['shape']  
+    w, q, p = parameter['weights'], parameter['q'], parameter['p']  
+    concordance += getConcordance(shape[A.shape], shape[B.shape], q, p) * w  
+    weight_sum += w
+    ...
+    concordance /= weight_sum  
+    return concordance
+```
+
+Funkcja `getConcordanceAllProducts()` ma za zadanie przy pomocy funkcji `getAllTypeConcordance(A, B)` wyliczyć  `Concordance` dla wszystkich produktów i zwrócić wynik w postaci listy:
+
+```javascript
+def getConcordanceAllProducts():  
+    C = []  
+    
+    for i in range(len(allProducts)):  
+        c = 0  
+        for j in range(len(allProducts)):  
+            if j==i:  
+                continue  
+            else:  
+                c += getAllTypeConcordance(allProducts[i], allProducts[j])  
+        c /= len(allProducts)-1  
+        C.append(c)  
+    return C
+```
+
+Funkcja `choseProducts(number)` ma za zadanie wybrać `number` produktów z dostawy na podstawie listy  `Concordance` zwróconej przez funkcję `getConcordanceAllProducts()`.
+
+```javascript
+def choseProducts(number):  
+    C = getConcordanceAllProducts()  
+    products = []  
+    prev = -1  
+    if number > len(allProducts):  
+        return allProducts  
+    while number > 0:  
+        max = -1  
+        if prev == -1:  
+            max = 0  
+        for j in range(len(allProducts)):  
+            if prev == -1:  
+                if C[max]<C[j]:  
+                    max = j  
+            elif max == -1:  
+                if C[prev]>C[j]:  
+                    max = j  
+            elif C[max] < C[j] and C[j] < C[prev]:  
+                max = j  
+        prev = max  
+        for j in range(len(allProducts)):  
+            if C[max] == C[j]:  
+                products.append(allProducts[j])  
+                print(C[j])  
+                number -= 1  
+            if number == 0:  
+                break  
+    print(C)  
+    return products
+```
+
+`print(C[j])` oraz `print(C)` służy do sprawdzenia poprawności algorytmu.
+
+### Uruchomienie algorytmu i jego działanie
+Film przedstawiający uruchomienie aplikacji:
+https://www.youtube.com/watch?v=DmwDlJkjtjs
+Parametry pojawiające się w terminalu:
+1.Concordance `number` najlepszych produktów (`print(C[j])`).
+2.Lista wszystkich Concordance ( `print(C)`).
+
+
diff --git a/__pycache__/mcda.cpython-38.pyc b/__pycache__/mcda.cpython-38.pyc
index 4a133b5fdd1c590041e86e23dc4b463c829f22fa..79e10a93b034ae505ce236949eb877dffbb5834c 100644
GIT binary patch
delta 37
rcmca0bU}zWl$V!_0SLJHkHqzF<XywY$hdhI+b%{%_sOLkw;1^Vv-%15

delta 37
scmca0bU}zWl$V!_0SNrB9gds0k#`LnBh%(xY`Yj4JtmiO++ySh0L)_x1^@s6

diff --git a/__pycache__/supply.cpython-38.pyc b/__pycache__/supply.cpython-38.pyc
index 39dde2d4754e0e516dc190d27abbb10cf45b82f3..8dba534f5924eca6a14a3d40d8b6ac89bced8eed 100644
GIT binary patch
delta 20
acmeC+>fquI<>lpK0D|MfM>cZ*WdQ&y$OQxd

delta 20
acmeC+>fquI<>lpK00O)Fhc|NnWdQ&z%mqdO

diff --git a/mcda.py b/mcda.py
index 742828c..68dd463 100644
--- a/mcda.py
+++ b/mcda.py
@@ -55,7 +55,6 @@ def getAllTypeConcordance(A, B):
     return concordance
 
 def getConcordanceAllProducts():
-
     C = []
 
     for i in range(len(allProducts)):

From e28c1268233dde25cafc388b94118515654c8646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Kuczy=C5=84ski?= <tomkuc2@st.amu.edu.pl>
Date: Tue, 19 May 2020 17:47:00 +0000
Subject: [PATCH 05/10] poprawa wizualna Raportu

---
 Raport_444420.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Raport_444420.md b/Raport_444420.md
index 01c7b80..45706d9 100644
--- a/Raport_444420.md
+++ b/Raport_444420.md
@@ -24,8 +24,11 @@ def sizeValue(X):
 ```
 
 Składa się róznierz z parametrów:
+
 `weights` - waga danego parametru
+
 `q` - współczynik pomyłki (granicy błędu) pomiędzy atrybutami
+
 `p` - maksymalna dopuszczalna różnica pomiędy atrybutami 
 
 ```javascript
@@ -152,8 +155,11 @@ def choseProducts(number):
 ### Uruchomienie algorytmu i jego działanie
 Film przedstawiający uruchomienie aplikacji:
 https://www.youtube.com/watch?v=DmwDlJkjtjs
+
 Parametry pojawiające się w terminalu:
+
 1.Concordance `number` najlepszych produktów (`print(C[j])`).
+
 2.Lista wszystkich Concordance ( `print(C)`).
 
 

From abf5829c3426e92ea4c08c6d8cc56a75dee54228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojtek.lukasik@yahoo.pl>
Date: Tue, 19 May 2020 22:21:13 +0200
Subject: [PATCH 06/10] zmiany

---
 __pycache__/data.cpython-37.pyc  | Bin 2311 -> 2311 bytes
 __pycache__/field.cpython-37.pyc | Bin 1606 -> 1606 bytes
 data.py                          |   2 +-
 field.py                         |   5 ++---
 main.py                          |   1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/__pycache__/data.cpython-37.pyc b/__pycache__/data.cpython-37.pyc
index 77ec7fdb49dbcfe2511f82a7ea2417da6b3f140e..196eabc65826b54364b04b6b53e72da128d0325d 100644
GIT binary patch
delta 22
ccmZn{Y8T>l;^pOH0D_JahvRl^<o(3~06T{Uj{pDw

delta 22
ccmZn{Y8T>l;^pOH0D|`i565la$oq=}06ysk?f?J)

diff --git a/__pycache__/field.cpython-37.pyc b/__pycache__/field.cpython-37.pyc
index 2a25f2452f0d68a928b0434daf9e793fe34b7a0b..a6aa6db7e4a8e075da7cb20f8641036987226605 100644
GIT binary patch
delta 47
zcmX@cbBu@AiI<m)0SKlaIvgjmkyneEQFXHg^K?c=jmZ~S)-f7Qu4k=bl$-pA)e8V8
Cf(<?Z

delta 47
zcmX@cbBu@AiI<m)0SG4TKO85tkyneEQEjsY^K?c=&B+&7)-f7Su4k=bl%M>E)e8V7
Cat$~D

diff --git a/data.py b/data.py
index 4c3a444..b8e059f 100644
--- a/data.py
+++ b/data.py
@@ -40,7 +40,7 @@ learning_data = [
     ['gold', 'rectangle', 40, 'medium', 'Twix'],
     ['gold', 'rectangle', 50, 'medium', 'Prince-polo'],
     ['brown', 'rectangle', 55, 'medium', 'Snickers'],
-    ['brown', 'rectangle', 45, 'medium', 'Lion'],
+     ['brown', 'rectangle', 45, 'medium', 'Lion'],
     ['white', 'rectangle', 40, 'medium', 'Kinder-bueno'],
     ['red', 'rectangle', 50, 'medium', 'Kit-kat'],
     ['blue', 'rectangle', 115, 'big', 'Wedel'],
diff --git a/field.py b/field.py
index d90ffa6..89f246a 100644
--- a/field.py
+++ b/field.py
@@ -33,7 +33,6 @@ class Field:
 
         self.rect.center = (center_x, center_y)
 
-
     # Metoda do wyświetlania pola na ekranie
     def blitme(self):
         self.screen.blit(self.image, self.rect)
@@ -49,5 +48,5 @@ class Field:
             self.neighbors.append(board[self.y + 1][self.x])
 
     def addShelf(self):
-        shelf = Shelf(len(self.shelves)+1)
-        self.shelves.append(shelf)
\ No newline at end of file
+        shelf = Shelf(len(self.shelves) + 1)
+        self.shelves.append(shelf)
diff --git a/main.py b/main.py
index f71fa65..0f4925b 100644
--- a/main.py
+++ b/main.py
@@ -46,7 +46,6 @@ def run():
                 elif event.key == pygame.K_SPACE:
                     board[9][0].item = choice(data.learning_data)
                     print("Wybrano: " + board[9][0].item[-1])
-                    board[9][0].item[-1] = 'Something'
                     field = board[9][0]
                     if not field.is_shelf:
                         path = functions.a_star(board[agent.y][agent.x], field, board)

From d55884cce61e80b2978d7e6e45a4da75c8feeb55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojtek.lukasik@yahoo.pl>
Date: Tue, 19 May 2020 23:27:29 +0200
Subject: [PATCH 07/10] stworzenie raportu

---
 .idea/misc.xml                                |   2 +-
 .idea/wozek.iml                               |   2 +-
 {Archiwum => Raporty}/README.md               |   0
 Raport_444420.md => Raporty/Raport_444420.md  |   0
 {Archiwum => Raporty}/environment.md          |   0
 Raporty/raport_444428.md                      | 132 ++++++++++++++++++
 .../route-planning.md                         |   0
 __pycache__/mcda.cpython-37.pyc               | Bin 0 -> 2370 bytes
 __pycache__/product.cpython-37.pyc            | Bin 0 -> 455 bytes
 __pycache__/supply.cpython-37.pyc             | Bin 0 -> 1272 bytes
 10 files changed, 134 insertions(+), 2 deletions(-)
 rename {Archiwum => Raporty}/README.md (100%)
 rename Raport_444420.md => Raporty/Raport_444420.md (100%)
 rename {Archiwum => Raporty}/environment.md (100%)
 create mode 100644 Raporty/raport_444428.md
 rename route-planning.md => Raporty/route-planning.md (100%)
 create mode 100644 __pycache__/mcda.cpython-37.pyc
 create mode 100644 __pycache__/product.cpython-37.pyc
 create mode 100644 __pycache__/supply.cpython-37.pyc

diff --git a/.idea/misc.xml b/.idea/misc.xml
index adaa126..715ed69 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (Projekt)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (AL-2020)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/wozek.iml b/.idea/wozek.iml
index 904114b..a9742fc 100644
--- a/.idea/wozek.iml
+++ b/.idea/wozek.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.8 (Projekt)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (AL-2020)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/Archiwum/README.md b/Raporty/README.md
similarity index 100%
rename from Archiwum/README.md
rename to Raporty/README.md
diff --git a/Raport_444420.md b/Raporty/Raport_444420.md
similarity index 100%
rename from Raport_444420.md
rename to Raporty/Raport_444420.md
diff --git a/Archiwum/environment.md b/Raporty/environment.md
similarity index 100%
rename from Archiwum/environment.md
rename to Raporty/environment.md
diff --git a/Raporty/raport_444428.md b/Raporty/raport_444428.md
new file mode 100644
index 0000000..f99651d
--- /dev/null
+++ b/Raporty/raport_444428.md
@@ -0,0 +1,132 @@
+# Wojciech Lukasik - drzewa decyzyjne, algorytm CART
+
+### Opis podprojektu
+Podprojekt implementuje tworzenie drzewa decyzyjnego w oparciu o algorytm CART 
+(Classification And Regression Tree), które pomaga Agentowi w rozpoznaniu słodyczy na podstawie
+ich cech fizycznych (kolor, kształt, masa, rozmiar).
+
+Wszystkie funkcje oraz klasy wykorzystywane w tym podprojekcie znajdują się w pliku decision_tree.py,
+dane uczące znajdują się w pliku data.py w liście learning_data
+
+### Tworzenie drzewa decyzyjnego
+
+Główną funkcją jest build_tree(rows), która jak wskazuje nazwa tworzy drzewo. Funkcja przyjmuje
+jako argument listę zawierającą zestaw danych, w tym przypadku będą to słodycze o różnych właściwościach.
+
+```python
+def build_tree(rows):
+    gain, question = find_best_split(rows)
+
+    if gain == 0:
+        return Leaf(rows)
+
+    true_rows, false_rows = partition(rows, question)
+
+    true_branch = build_tree(true_rows)
+
+    false_branch = build_tree(false_rows)
+
+    return DecisionNode(question, true_branch, false_branch)
+```
+
+Drzewo jest budowane w oparciu o najlepsze możlwe podziały (najbardziej korzystne 'pytanie', które można zadać). 
+Zajmuje się tym funkcja
+
+`find_best_split(rows)` która dla wszystkich właściwości przekazanego zestawu informacji
+wylicza dla nich 'zysk informacji'.
+ 
+Jeżeli nie otrzymujemy żadnych informacji (gain == 0) to znaczy, że znajdujemy
+się w liściu drzewa.
+
+```python
+def find_best_split(rows):
+    """ znajdź najlepsze możliwe pytanie do zadania, sprawdzając wszystkie
+        właściwośći oraz licząc dla nich 'info_gain' """
+    best_gain = 0
+    best_question = None
+    current_uncertainty = gini(rows)
+    n_features = len(rows[0]) - 1
+
+    for col in range(n_features):
+        values = set([row[col] for row in rows])
+
+        for val in values:
+            question = Question(col, val)
+
+            true_rows, false_rows = partition(rows, question)
+
+            if len(true_rows) == 0 or len(false_rows) == 0:
+                continue
+
+            gain = info_gain(true_rows, false_rows, current_uncertainty)
+
+            if gain > best_gain:
+                best_gain, best_question = gain, question
+
+    return best_gain, best_question
+```
+
+Zysk informacji z danego podziału otrzymujemy obliczając wartość 'Gini Impurity'. Jest to miara tego jak często losowo 
+wybrany element zbioru byłby źle skategoryzowany, gdyby przypisać mu losową kategorię spośród wszystkich kategorii 
+znajdujących się w danym zbiorze.
+
+```python
+def gini(rows):
+    counts = class_counts(rows)
+    impurity = 1
+    for lbl in counts:
+        prob_of_lbl = counts[lbl] / float(len(rows))
+        impurity -= prob_of_lbl ** 2
+    return impurity
+```
+`class_counts(rows)` to funkcja, która dla danego zestawu danych zwraca wszystkie unikalne klasy oraz liczbę ich wystąpień. 
+
+Dla przykładu, dla zestawu w którym wszystkie elementy podchodzą pod tę samą kategorię wartość Gini będzie równa zero, 
+natomiast dla zbioru w którym znajdują się dwie kategorie wartość ta wyniesie 0,5. 
+
+Po znalezieniu najbardziej optymalnego pytania, algorytm dzieli zestaw na elementy, dla których pytanie jest prawdziwe
+(true_rows), oraz te dla których jest fałszywe (false_rows). Następnie wykonuje rekurencyjnie procedurę build_tree dla
+obu poddrzew tak długo aż nie dojdzie do liści.
+
+Element o zadanym zestawie cech, zostaje odnaleziony w drzewie dzięki prostej procedurze 
+
+`classify(row, node)`  'row' to lista cech elementu, natomiast 'node' na początu jest korzeniem już zbudowanego drzewa.
+
+Element jest odnaleziony dzięki
+rekurencyjnym porównaniom atrybutów elementu z pytaniami w kolejnych węzłach drzewa.
+
+```python
+def classify(row, node):
+    if isinstance(node, Leaf):
+        return node.predicions
+
+    if node.question.match(row):
+        return classify(row, node.true_branch)
+    else:
+        return classify(row, node.false_branch)
+```
+
+### Zestaw uczący
+
+Zestaw budujący drzewo to lista zawierająca 27 przykładowych słodyczy. Ich atrybuty zapisane są w formacie ['kolor', 
+'kształt', 'masa', 'wielkość', 'nazwa']. Oczywiście przy wyszukiwaniu elementu w drzewie jego nazwa nie jest potrzebna 
+ponieważ to jej szukamy. Przykładowe elementy z zestawu uczącego:
+
+```python
+    ['black',  'rectangle', 51,  'small', 'Mars'],
+    ['gold',   'pack',      100, 'big',   'Haribo'],
+    ['purple', 'rectangle', 100, 'big',   'Milka'],
+    ['brown',  'pack',      45,  'small', 'M&M'],
+```
+
+### Implementacja w projekcie
+
+Przy rozpoczęciu głównej pętli programu w pliku `main.py` drzewo `my_tree` zostaje zbudowane w oparciu o dane 
+`data.learning_data`. 
+
+Gdy program już działa, po wciśnięciu `spacji` jeden ze słodyczy zostanie losowo wybrany z zestawu `data.learning_data`
+oraz umieszczony na polu `board[9][0]`, a jego nazwa zostanie wypisana w konsoli. Następnie Agent przemieszcza się do
+punktu `board[9][0]` i rozpoczne procedurę wyszukiwania elementu w zbudowanym drzewie. Na końcu wypisze w 
+konsoli nazwę produktu.
+
+
diff --git a/route-planning.md b/Raporty/route-planning.md
similarity index 100%
rename from route-planning.md
rename to Raporty/route-planning.md
diff --git a/__pycache__/mcda.cpython-37.pyc b/__pycache__/mcda.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a51297a23ec784757ab4f8f2d3f374ac4308af95
GIT binary patch
literal 2370
zcma)7&u<(x6t+E{+1bsHhBR%OrcKiXN*1Xls-P`Zp-o$f98grL6+xpwH5rdKo6PRc
zdS*$AW=_k28yq?0P>x9a4@eb%g-=MFmcIaTf$w?q6H%!i`PqK9pZ&h~J<r3ju^L19
z_5N>PeLuq3A2c{DRdgPpW<NqGrg*}hv6%N+Ae2y!lFC({swiJoRc+r795tdw)flwn
z`!b+efw?pLPT;Bu_13p6@YJL_i+xl3jyi|ldE1*-7hsKaXYtM0-bGlbs9ALhyL@$7
z&7rNTD{3BXO<h$BXh+oIQ&xX_fZMS;H~hW91bPE<XyB5lkQgN~PGXD%oMd(1xSL5B
z?HJkUB+7VcPp3%?rS9yujoeIn80>B}^Vm2##)6Ix+l_c|hAf;VLD<x#sp>e&F@?=C
zC4*kp?S&fKwnJTajGMK>Br#qqR?S|^IGfEz#IcnMwF31KYW4u4VA}wBN9ZZ^xDvDM
z=}_lDw`6tlNasR#&+0tVDb#vpO<#l^P0s6C5|YFvh`|&@T^N})zrkHwVU`hOU;NDU
zRm}Xo@c8b=)4Zpe;l>l)*@joy#>!{cZ!X_l-e^TCypg^zRoeS`2yn>zjDTglcJ%2*
zj0X-0at+>BcH?GaE6)t?8lDd5G6N5yfr|3`{Q>zu@F9Su8+DS724q`d8tW@i>N$vr
zwo##$tXsT3K&RjZE5tP0;d(-GU`1ocj+YCk;1_`2G&F^{z$``r7&&YD9qiR~MeBN9
z2BNWo`cS`1x~0PjJF6EkG~<mpf7EG59j(H46i-8!*}UPST%t~K{XTRNxkH6KB1i32
zS8<f$C32>8a;BUaR?0#uIl~}bE4>+bCRpi~URfzb&U1m#iW!EMQ(JgNr7sJ2irr?V
zfJ-h~vQ~K`YYwd8+#H}#`&w)M8(EVD>+@U|yw6{2srp8iT-*x?<Sy<-Nc^vt1^m5C
zUQ_sLYX{^x4B>Uatgn$cj@}I#9ucVSnOYj^uodUA&TOEx-DQ_8(pusf9tFN)_`_f%
zI*xQu8&ddr)@udTBP)jQo;Z#Y=mc5Lfh;RY^6W(#pWqA~krB5T7$b$xFYyKLpK9k$
zjWtm`q777t{1sHos2rUJE7{(5&WJ00MB*{~GAKFmZ12`7?X}XOWWaNAr@Pc$0=pby
zmE{(=&=<t0?$SC^X=qC!T`b=0r7XlxoU`sEX6b=J^4Pqg463`vwXdRalDKU~@Xq1o
zP(8dH_Ugt9(==`?WHx_fc+>F6@a-W^7BQPyGp92PxE&h#2xnyUY5_1Y3D73FkKRQ-
z!N<A&82Y1^lv0h}JPXcw+%RW-R&qcj00_uGbZkfJxf~?g`?Fw5?8qOu_AxID$G*CE
zk)U!f2Rz4+s?t4}-Nx%eDa#8Gb%*I+3b&NqRirRM`yKR@Si@O)G<$l_>TrIz7B*Ig
zHUO?HoxLZgPJV!sPwp1_uR^?(2p!I+pit6KzmGoraqfT+)-R!7Jz?Ef>#RG!ZdchA
zlss~6@DIv~7<v{+eGA~}+ax|DaR<V<scyFOx)*ruUTZVfngU|{^dQFg-|6^k<Fvv(
zeUCQ%Ckw`+txgsn2J=&_$jB_?9`XO+-INqk8`ufxeT3HI^9MQ#^C<d0elR}Q6x+4>
zXy9eNG)-OvQ<09tJbtdiJbZq5si6<Y$xTUTe@l9qdh|wHZVtUBlP9iyOiKS=3q(%h
dPe3J>(J$2(o;Xhz623qD<4rhz#h>-Z{{`Q-?~DKd

literal 0
HcmV?d00001

diff --git a/__pycache__/product.cpython-37.pyc b/__pycache__/product.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c5d2555af12938ca13d899404e7bb12fa59a4007
GIT binary patch
literal 455
zcmYjMJx{|h5Is8y4HcCTVq|6LKvi`_2+D`Vf-0nLQG^x6K?J2A*y%u(jsBTV`~(($
zg;#z88x!vmih9<2ced}IpRYQdHX%MPJ|EtZzj(6=55*9$2cTQhq{Rw&lM!h-rmmOb
z{68eBAz%+d8AU=<B(>0TMUkgH^!u)LZ)SRtmT7<<4$eGy4cH@4B`Q)>NwBCqu&jKr
zrwIaL1dSk_6*J=k`;^Qx=T8!Aop1AH)(w!e;?c06Ve`gk;y2c0T1Y>~H>dHqT<AQB
zVdXhXOB-L_oecVeemrly_2#cGR4Sk5rBbY7LlB9bdM)?=zR=sWuqX6SlS!tOYb!Ou
y7YnZUlzLetMRQ|zAyS*zB33qn)d9=CLs{=fT~X()UiNQzz=dbc6X!hj4bU$!(O$Oz

literal 0
HcmV?d00001

diff --git a/__pycache__/supply.cpython-37.pyc b/__pycache__/supply.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fb3c123dd040b474f2f7ab4b29cd70110759f0f2
GIT binary patch
literal 1272
zcmcgsJ8u**5VrSq$=+QO;DAeb1W1Zp5fmK-5<<L1g(9RhC^`}C?O4Yq-n+%#Rfu${
z;D<m5zk-I}K;f3kJyj}Zjvyh$ONk}VdOm;tJTvm_lXg31IKDpo_Id+XKgjtrJX}1&
zsk>-^0hcW2yPPxd!2iH@JqUJKFSNMJdfYT#stHtSnUYU~&WAXk;?$qf8?j?nq7I#h
z;C*n+r|cu2@=vJw4?Khj8ZdW;KaV;tJVt)gq2EG&8y3#!v|tgIYWU|Ic!)Yn4jsZ>
z`Z40?9el!@4*Wumey2vC^1A4#59wTT#NWaCTz1^sMZPN@(s#vA`7YPo>&92$N)7+2
zBhDCB;F^O^_;m-~L44Jb7q7v)E_}-HP2boy;ZP>&ftgn#EtBy`3VR2iu?cmaNNIx6
zM1lzlq*x%_A7&#H6_qNaz_V&{IJTR#5e#J|Y@e1<E+DIN6X~~AqJ-T*(5{iWOWWb$
zo2(SZR|2dibdk(++KMI$V-WToIsSg4vRBwnb{XC5Cr9%gjXgoP=P7DC6D36<#?bRj
z6XQMYOl=y)?;ica)Gef)tUtRq*eNT>k^yq|F;_i!{9?1e)!!QEswm{q?c&IEQYDg7
z>_Ji{d#4II!1KC9!+78=@R<L{>8W+Rcf04SoA{k&JVRzl{bi`QX6}BD|0O9NV2zlj
H>a_e{-z^;D

literal 0
HcmV?d00001


From 60c2cbc17ad804a28adc72d0dc95d92a5142edfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojluk1@st.amu.edu.pl>
Date: Tue, 19 May 2020 21:41:26 +0000
Subject: [PATCH 08/10] Zaktualizuj 'Raporty/raport_444428.md'

---
 Raporty/raport_444428.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Raporty/raport_444428.md b/Raporty/raport_444428.md
index f99651d..7f9d0b9 100644
--- a/Raporty/raport_444428.md
+++ b/Raporty/raport_444428.md
@@ -10,8 +10,11 @@ dane uczące znajdują się w pliku data.py w liście learning_data
 
 ### Tworzenie drzewa decyzyjnego
 
-Główną funkcją jest build_tree(rows), która jak wskazuje nazwa tworzy drzewo. Funkcja przyjmuje
-jako argument listę zawierającą zestaw danych, w tym przypadku będą to słodycze o różnych właściwościach.
+Główną funkcją jest 
+
+`build_tree(rows)`  która jak wskazuje nazwa tworzy drzewo. 
+
+Funkcja przyjmuje jako argument listę zawierającą zestaw danych, w tym przypadku będą to słodycze o różnych właściwościach.
 
 ```python
 def build_tree(rows):
@@ -79,14 +82,12 @@ def gini(rows):
         impurity -= prob_of_lbl ** 2
     return impurity
 ```
-`class_counts(rows)` to funkcja, która dla danego zestawu danych zwraca wszystkie unikalne klasy oraz liczbę ich wystąpień. 
+`class_counts(rows)` to funkcja, która dla danego zestawu danych zwraca wszystkie unikalne 'kategorie' oraz liczbę ich wystąpień. 
 
-Dla przykładu, dla zestawu w którym wszystkie elementy podchodzą pod tę samą kategorię wartość Gini będzie równa zero, 
-natomiast dla zbioru w którym znajdują się dwie kategorie wartość ta wyniesie 0,5. 
+Dla przykładu, w zestawie w którym wszystkie elementy podchodzą pod tę samą kategorię wartość Gini Impurity będzie równa zero, natomiast w zbiorze w którym znajdują się dwie kategorie wartość ta wyniesie 0,5. Im więcej różnych kategorii tym bardziej wartość Gini Impurity będzie zbliżała się do 1.
 
 Po znalezieniu najbardziej optymalnego pytania, algorytm dzieli zestaw na elementy, dla których pytanie jest prawdziwe
-(true_rows), oraz te dla których jest fałszywe (false_rows). Następnie wykonuje rekurencyjnie procedurę build_tree dla
-obu poddrzew tak długo aż nie dojdzie do liści.
+(true_rows), oraz te dla których jest fałszywe (false_rows). Następnie wykonuje rekurencyjnie procedurę `build_tree` dla obu poddrzew tak długo aż nie dojdzie do liści.
 
 Element o zadanym zestawie cech, zostaje odnaleziony w drzewie dzięki prostej procedurze 
 

From 2f5ffee005042f3197976a070ba58bd543744e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojluk1@st.amu.edu.pl>
Date: Tue, 19 May 2020 21:42:01 +0000
Subject: [PATCH 09/10] Zaktualizuj 'Raporty/raport_444428.md'

---
 Raporty/raport_444428.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Raporty/raport_444428.md b/Raporty/raport_444428.md
index 7f9d0b9..b968c8f 100644
--- a/Raporty/raport_444428.md
+++ b/Raporty/raport_444428.md
@@ -1,4 +1,4 @@
-# Wojciech Lukasik - drzewa decyzyjne, algorytm CART
+# Wojciech Łukasik - drzewa decyzyjne, algorytm CART
 
 ### Opis podprojektu
 Podprojekt implementuje tworzenie drzewa decyzyjnego w oparciu o algorytm CART 

From 35ffb5bf040631e4cf993db4b89b3236f737d635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojluk1@st.amu.edu.pl>
Date: Tue, 19 May 2020 22:30:11 +0000
Subject: [PATCH 10/10] Zaktualizuj 'Raporty/raport_444428.md'

---
 Raporty/raport_444428.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Raporty/raport_444428.md b/Raporty/raport_444428.md
index b968c8f..12c5088 100644
--- a/Raporty/raport_444428.md
+++ b/Raporty/raport_444428.md
@@ -43,8 +43,6 @@ się w liściu drzewa.
 
 ```python
 def find_best_split(rows):
-    """ znajdź najlepsze możliwe pytanie do zadania, sprawdzając wszystkie
-        właściwośći oraz licząc dla nich 'info_gain' """
     best_gain = 0
     best_question = None
     current_uncertainty = gini(rows)