From 7235b05840151e9f75742e702d4e2b476e8337e5 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 22 Jun 2023 22:02:13 +0100
Subject: [PATCH] .

---
 gen.py         | 3 ++-
 rota/shifts.py | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gen.py b/gen.py
index 466ecf3..7143593 100644
--- a/gen.py
+++ b/gen.py
@@ -29,7 +29,7 @@ suspend_on_finish = False
 solve = True
 # time_to_run = 508500
 # time_to_run = 2660000
-time_to_run = 60 * 10
+time_to_run = 60 * 1
 # allow = 5000
 ratio = 0.01
 # ratio = 0.9
@@ -335,6 +335,7 @@ if load_leave:
 # Rota.build_model()
 
 solver_options = {"ratio": ratio, "seconds": time_to_run, "threads": 10}
+solver_options = {"ratio": ratio, "seconds": time_to_run, }
 
 #start_time = time.time()
 Rota.build_and_solve(solver_options, export=True)
diff --git a/rota/shifts.py b/rota/shifts.py
index f481d49..1252b88 100644
--- a/rota/shifts.py
+++ b/rota/shifts.py
@@ -325,7 +325,7 @@ class RotaBuilder(object):
         try:
             console.print("Solving")
 
-            log_file = f"{self.name}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}.log"
+            log_file = f"logs/{self.name}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}.log"
             if use_neos:
                 solver_manager = SolverManagerFactory("neos")  # Solve using neos server
                 # results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
@@ -2902,7 +2902,11 @@ class RotaBuilder(object):
         return self.start_date + datetime.timedelta(weeks=week)
 
     # RESULTS
-    def export_rota_to_html(self, filename: str = "rota", folder=None):
+    def export_rota_to_html(self, filename: str = "rota", folder=None, timestamp_filename=True):
+        if timestamp_filename:
+            filename = f"{filename}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}"
+
+
         if folder is not None:
             output_file = Path("output", folder, f"{filename}.html")
         else: