From 9c86819931af3310bf01a01eee5091f34b06c81c Mon Sep 17 00:00:00 2001
From: tonywesoly <apalecapalec@gmail.com>
Date: Thu, 12 May 2022 23:19:46 +0200
Subject: [PATCH] Fix decision tree

---
 Environment.py      |  6 +++---
 Moving_truck.py     |  1 +
 Package.py          | 15 +++++++++++++++
 Packages_spawner.py | 16 ++--------------
 Truck.py            |  2 ++
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Environment.py b/Environment.py
index d8d0d44..4898e0f 100644
--- a/Environment.py
+++ b/Environment.py
@@ -24,7 +24,7 @@ class Environment:
         self.add_shelfs_to_enviroment_2d()
         # TEST CREATE PACKAGE
         self.package_spawner = Packages_spawner(window, self.enviroment_2d)
-        self.sector_decision = self.package_spawner.spawn_package()
+        self.package_spawner.spawn_package()
         new_truck = Truck(window, 14, 7)
         self.enviroment_2d[14][7] = new_truck
         self.truck = new_truck
@@ -45,7 +45,7 @@ class Environment:
     def update_all_elements(self):
         self.use_astar()    # wywyoływanie za każdym razem astar jest bardzo zasobożerne. Lepiej raz na przejście
         self.update_truck()
-        time.sleep(0.5)
+        # time.sleep(0.5)
 
     # def use_decision_tree(self):
     #     marking = self.package.type
@@ -63,7 +63,7 @@ class Environment:
         start_state = State(1,self.truck.x,self.truck.y) # sprawić aby paczka i shelf były wyszukiwane raz
         if self.truck.has_package:
             end_position = self.finding_fields.find_closest_shelf(self.truck, self.truck.package_type,
-                                                                  self.sector_decision)
+                                                                  self.truck.sector)
         else:
             end_position = self.finding_fields.find_package()
         end_state = State(1,end_position.x, end_position.y)
diff --git a/Moving_truck.py b/Moving_truck.py
index 87c6172..ea01939 100644
--- a/Moving_truck.py
+++ b/Moving_truck.py
@@ -29,6 +29,7 @@ class Moving_truck:
         package = self.enviroment_2d[package_x][package_y]
         self.truck.has_package = True
         self.truck.package_type = package.type
+        self.truck.sector = package.sector
         self.move_without_swapping(truck_x, truck_y, package_x, package_y)
 
 
diff --git a/Package.py b/Package.py
index 6062adf..a7ac3e6 100644
--- a/Package.py
+++ b/Package.py
@@ -7,6 +7,7 @@ from Types_colors import Types_colors
 from Package_types import Package_types
 import math
 from CompanyFactory import CompanyFactory
+from decision_tree.Decision_tree import DecisionTree
 
 
 class Package(Field):
@@ -17,7 +18,21 @@ class Package(Field):
         self.company = CompanyFactory()
         self.payed_upfront = random.randint(0,1)
         self.is_placed = False
+        weekend = random.randint(0,1)
+        self.sector = self.use_decision_tree(weekend)
 
+    def use_decision_tree(self, weekend):
+        marking = self.type
+        if marking == Package_types.fragile:
+            marking = 0
+        elif marking == Package_types.priority:
+            marking = 1
+        tree = DecisionTree(marking, weekend, self.company.popularity,
+                            self.company.payment_delay, self.payed_upfront,
+                            self.company.shipping_type)
+        decision = tree.decision
+        return decision
+    
     def get_marking_photo(self):
         file_path_type = ["resources/package_markings/*.jpg"]
         images = glob2.glob(random.choice(file_path_type))
diff --git a/Packages_spawner.py b/Packages_spawner.py
index 43ae7b4..6b43294 100644
--- a/Packages_spawner.py
+++ b/Packages_spawner.py
@@ -13,21 +13,9 @@ class Packages_spawner:
     def spawn_package(self):
         package_x = random.randrange(22, 26)
         package_y = random.randrange(1, 13)
-        weekend = random.randint(0,1)
         package_type = random.choice(list(Package_types))
         new_package = Package(self.window, package_x, package_y, package_type)
+        # sector_type = self.use_decision_tree(new_package, weekend)
         self.enviroment_2d[package_x][package_y] = new_package
-        sector_type = self.use_decision_tree(new_package, weekend)
-        return sector_type
+        # return sector_type
 
-    def use_decision_tree(self, package, weekend):
-        marking = package.type
-        if marking == Package_types.fragile:
-            marking = 0
-        elif marking == Package_types.priority:
-            marking = 1
-        tree = DecisionTree(marking, weekend, package.company.popularity,
-                            package.company.payment_delay, package.payed_upfront,
-                            package.company.shipping_type)
-        decision = tree.decision
-        return decision
diff --git a/Truck.py b/Truck.py
index f845457..9631aae 100644
--- a/Truck.py
+++ b/Truck.py
@@ -1,6 +1,7 @@
 import pygame
 from Field import Field
 from Global_variables import Global_variables as G_var
+from Sectors_types import Sectors_types
 from Types_colors import Types_colors
 from Package_types import Package_types
 
@@ -11,6 +12,7 @@ class Truck(Field):
         self.image = pygame.image.load("resources/truck.jpeg").convert()
         self.has_package = False
         self.package_type = Package_types.fragile
+        self.sector = Sectors_types.fragile
 
     # drawing the truck
     def draw(self):