Fixed tourn_nr Bug.

Author: DimitriWeiss

.gitignore

@@ -15,6 +15,8 @@ rtac/logs/Cadicalpp_CPPL_gb
 rtac/logs/TSP_Qpp_ReACTRpp
 rtac/logs/TSP_RT_CPPL
 rtac/logs/TSP_RTpp_ReACTRpp
+rtac/logs/Cadicalpp_ReACTR_gb
+rtac/logs/Cadicalpp_ReACTRpp_gb
 rtac/data/instances/power_law_easy
 rtac/data/solvers/cadical
 

rtac/ac_functionalities/ta_runner.py

@@ -276,7 +276,7 @@ def run(self, instance: str, config: Configuration,
         while self.running:
             # Avoid checking output excessively often (causes too much
             # overhead)
-            time.sleep(5e-6)  
+            time.sleep(5e-6)
 
             ta_output = non_block_read(self.proc.stdout, self.logs)
 

rtac/ac_functionalities/tournament_manager.py

@@ -83,7 +83,9 @@ def __init__(self, scenario: argparse.Namespace, ta_runner: BaseTARunner,
 
         if self.scenario.gray_box:
             self.es_tourn_nr = 0
-            self.tourn_nr_list = [self.tourn_nr]
+            #self.tourn_nr_list = [self.tourn_nr]
+
+        self.tourn_nr_list = [self.tourn_nr]
 
         self.logs.init_rtac_logs()
         self.logs.init_ranking_logs()
@@ -127,7 +129,7 @@ def manage_tournament(self, instance: str, rtac_data: RTACData):
         cores_start = [i for i in range(self.scenario.number_cores)]
         self.tournament.start_tournament(self.instance, self.contender_dict,
                                          self.tourn_nr, cores_start)
-        self.rtac_data = self.tournament.rtac_data = rtac_data
+        # self.rtac_data = self.tournament.rtac_data = rtac_data
         self.tournament.watch_tournament()
 
         # Update tournament status
@@ -146,7 +148,12 @@ def manage_tournament(self, instance: str, rtac_data: RTACData):
 
         self.instance_history.append(instance)
 
-        self.tourn_nr += 1
+        # self.tourn_nr += 1
+        self.tourn_nr = self.tourn_nr_list[-1] + 1
+        self.tourn_nr_list.append(self.tourn_nr)
+
+        self.res_process.tourn_nr = self.tourn_nr
+        self.tournament.tourn_nr = self.tourn_nr
 
     def general_logging(self, scenario=None, rtac_data=None,
                         tournamentstats=None, tourn_nr=None,
@@ -249,6 +256,7 @@ def solve_instance(self, instance: str, rtac_data: RTACData,
         :rtype: RTACData
         """
 
+        self.rtac_data = self.tournament.rtac_data = rtac_data
         tourn_nr = self.get_tourn_nr(rtac_data)
 
         self.kwargs = kwargs
@@ -277,6 +285,7 @@ def solve_instance(self, instance: str, rtac_data: RTACData,
         :rtype: RTACData
         """
 
+        self.rtac_data = self.tournament.rtac_data = rtac_data
         tourn_nr = self.get_tourn_nr(rtac_data)
 
         self.kwargs = kwargs
@@ -362,6 +371,8 @@ def manage_tournament(self, instance: str, rtac_data: RTACData):
 
                 self.tourn_nr = self.tourn_nr_list[-1] + 1
                 self.tourn_nr_list.append(self.tourn_nr)
+                self.res_process.tourn_nr = self.tourn_nr
+                self.tournament.tourn_nr = self.tourn_nr
 
                 self.finished.set()
                 gc.collect

rtac/data/cadical_scenario_rt_cppl_100_gb.txt

@@ -22,7 +22,7 @@
 --paramlimit 100000
 --epsilon_greedy
 --gen_mult 2
---gray_box
+#--gray_box
 --gb_read_time 0.1 #1.0
 --nr_gb_feats 6
 #--isolate_bandit

rtac/logs/Cadicalpp_CPPL/.fuse_hidden000028a400000100

@@ -0,0 +1,50 @@
+11/06/2025 02:19:27: 79aec6634aeb4aac965e010fa2e8fe60
+
+11/06/2025 02:20:16: 79aec6634aeb4aac965e010fa2e8fe60
+
+11/06/2025 02:20:59: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:21:37: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:21:52: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:22:33: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:22:54: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:23:33: 33bc4ceb4ba9407686547d38e3dbe783
+
+11/06/2025 02:24:33: bc268fc9652d49d3bd56a2a49d47b3b9
+
+11/06/2025 02:24:36: bc268fc9652d49d3bd56a2a49d47b3b9
+
+11/06/2025 02:25:29: 82307259ceba44f6a44b96c8e32ea678
+
+11/06/2025 02:26:04: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:26:41: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:27:25: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:28:07: 82307259ceba44f6a44b96c8e32ea678
+
+11/06/2025 02:28:41: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:29:19: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:30:06: e8d235377a194c989db55a4b9811e1e2
+
+11/06/2025 02:31:00: 5300e20e1e454eebbac1c96cbddb91e2
+
+11/06/2025 02:31:53: 5300e20e1e454eebbac1c96cbddb91e2
+
+11/06/2025 02:32:32: 5300e20e1e454eebbac1c96cbddb91e2
+
+11/06/2025 02:33:15: 5300e20e1e454eebbac1c96cbddb91e2
+
+11/06/2025 02:33:50: 8c4ecccec016495996f0e3497036c1fe
+
+11/06/2025 02:34:27: 8c4ecccec016495996f0e3497036c1fe
+
+11/06/2025 02:34:59: 8c4ecccec016495996f0e3497036c1fe
+

rtac/logs/Cadicalpp_CPPL/.fuse_hidden000028a50000010b

@@ -0,0 +1,2 @@
+24
+

rtac/logs/Cadicalpp_CPPL/.fuse_hidden000028a60000010a

@@ -0,0 +1,2 @@
+{'52bfe9c1ada44566809872b8f84f1f8a': 25.92, '42fd7d46175d48fcb9057c60eafeff7e': 30.1, 'd4eee24b5eb74659ad59876d6e0fcb64': 25.3, 'f2c7b9f6baa84d879e61f207a6fbb405': 21.75, '139eece409854f5bb17f606eaf054cfc': 0.0, 'a64973784d0e4c9ead657042cb310035': 27.79, '2331e0440e1a4ddeb18c8a632ecc6590': 0.0, 'cb8f1bde831b4c82a85cc76a9bce7247': 33.68, '67bbdf185a1e4c1abced8d014320c37b': 0.0, 'ca38661680c54f63b0233647da174f7d': 34.03, 'e6f029971b6c4fbba1f9f5d896c20b8d': 29.87, '3ae18ff8629a4bc980347929ac7c32ab': 20.68, '36bee1ded79947e4b6efad028c94615a': 20.73, '26a18aea9662478aaca21a5361f4add7': 25.23, '8433fef626e94284af5c28628f511e8a': 24.23, '5a5f6a3c0f3e4c24bc229d745d3ef4cb': 19.2, '8a2d936c78dd45ce8dabaa6acc9a1b35': 21.45, 'ee37f338f14a444398fd79b7765603d3': 21.35, 'a0acf91b4a784877aaff489b40a40bdd': 31.25, '34bfa344614b4c13a89770a124a5667c': 31.3, 'f161e7a5fdb046dc9d76171d17f163c4': 22.17, 'f3c43ac2d40948d683999deb4fcacd84': 25.14, '52378b8465354822a41d9c7bb8b66979': 18.78, 'c614149c18284d5c92a233b8c1956c01': 20.56, 'a1d02cdec0c74a0aab16e1852b06643e': 18.4}
+

rtac/logs/Cadicalpp_CPPL/.fuse_hidden000028a700000109

@@ -0,0 +1 @@
+['806b1e3e7bea4b06b6046020d9e03b14', 'bc268fc9652d49d3bd56a2a49d47b3b9', '511a6d09b40845c1b24b9e345b04f2b0', 'de25abf7bddf488aa070d828c633b37c', '54a7753120f3448da30ccc0ee83cd75b', '030ae680d63e41a7b785ab82501c22af', 'cd9849a2cbcb4a51954ff680c2944269', '01865ec8731e4e3a913430f1457c3d99']