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