updated gui and showroom

PhilippBrendel · Apr 26, 2021 · 68f2962 · 68f2962
1 parent dc04806
commit 68f2962
Show file tree

Hide file tree

Showing 33 changed files with 5,558,979 additions and 18 deletions.
diff --git a/config.yaml b/config.yaml
@@ -34,12 +34,12 @@ lon: [7.50, 7.90]
 ##################
 # Model settings #
 ##################
-objective: 0
+objective: 1
 constr_j: True          # (1j) valid inequality
 min_vehicles: True      # toggle obj and constraints connected to z
 limit_vehicles: True    # (1l) limit charging vehicles at locations
 visualize: True         # visualize solution
-constrain_vehicles: 0   # only allow leq this many vehicles being used 
+constrain_vehicles:   # only allow leq this many vehicles being used 
 
 ######################
 # Heuristic settings #

diff --git a/gui.py b/gui.py
@@ -159,7 +159,7 @@ def run(self):
                     if self.visuals.t_ind  < self.visuals.t_steps - 1:
                         self.visuals.t_ind += 1
                 elif event == 'IP_SHOW_MAP':
-                    self.visuals.show_map = values['IP_SHOW_MAP']
+                    self.visuals.ip_show_map = values['IP_SHOW_MAP']
                 elif event == 'IP_APPLY_LIM':
                     update = True
                     try:

diff --git a/showroom/18c_01p/18c_01p_020t_11v.p b/showroom/18c_01p/18c_01p_020t_11v.p