feat: add test count for recording datas

qtslab · Oct 17, 2024 · 8334a95 · 8334a95
1 parent 179dbff
commit 8334a95
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/config/config.toml b/config/config.toml
@@ -2,8 +2,8 @@
 size = 20
 
 [algorithm]
-max_gen = 1000
+max_gen = 100
 n_neighbors = 10
 
 [test]
-count = 100
+count = 1
diff --git a/src/aeqts.rs b/src/aeqts.rs
@@ -5,7 +5,13 @@ use crate::types::{Items, Qubits, Solution};
 
 use crate::record::Record;
 
-pub fn aeqts(items: &Items, capacity: f64, max_gen: i32, n_neighbors: i32) -> Solution {
+pub fn aeqts(
+    items: &Items,
+    capacity: f64,
+    max_gen: i32,
+    n_neighbors: i32,
+    test_count: i32,
+) -> Solution {
     let mut qubits: Qubits = vec![Default::default(); items.len()];
     let mut best_fit: Solution = vec![false; items.len()];
     adjust_solution(&items, &mut best_fit, capacity);

diff --git a/src/main.rs b/src/main.rs
@@ -27,12 +27,14 @@ fn main() {
                 capacity,
                 config.algorithm.max_gen,
                 config.algorithm.n_neighbors,
+                i,
             );
             aeqts(
                 &items,
                 capacity,
                 config.algorithm.max_gen,
                 config.algorithm.n_neighbors,
+                i,
             );
             println!("thread[{}] done", i);
         });

diff --git a/src/qts.rs b/src/qts.rs
@@ -5,7 +5,13 @@ use crate::types::{Items, Qubits, Solution};
 
 use crate::record::Record;
 
-pub fn qts(items: &Items, capacity: f64, max_gen: i32, n_neighbors: i32) -> Solution {
+pub fn qts(
+    items: &Items,
+    capacity: f64,
+    max_gen: i32,
+    n_neighbors: i32,
+    test_count: i32,
+) -> Solution {
     let mut qubits: Qubits = vec![Default::default(); items.len()];
     let mut best_fit: Solution = vec![false; items.len()];
     adjust_solution(&items, &mut best_fit, capacity);