Set baseline fields to private by default.

This commit is contained in:
FiveMovesAhead 2025-09-30 15:33:50 +01:00
parent 270f0eaa85
commit 3f3227df5e
5 changed files with 25 additions and 0 deletions

View File

@ -25,6 +25,7 @@ flate2 = { version = "1.0", optional = true }
base64 = { version = "0.21", optional = true }
[features]
pub_baseline = []
bincode_solution = ["bincode", "flate2", "base64"]
c001 = []
satisfiability = ["c001"]

View File

@ -9,7 +9,10 @@ use std::sync::Arc;
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Difficulty {
pub num_hyperedges: u32,
#[cfg(feature = "pub_baseline")]
pub better_than_baseline: u32,
#[cfg(not(feature = "pub_baseline"))]
better_than_baseline: u32,
}
impl From<Vec<i32>> for Difficulty {
@ -75,7 +78,10 @@ pub struct SubInstance {
pub d_node_degrees: CudaSlice<i32>,
pub d_node_offsets: CudaSlice<i32>,
pub d_node_hyperedges: CudaSlice<i32>,
#[cfg(feature = "pub_baseline")]
pub baseline_connectivity_metric: u32,
#[cfg(not(feature = "pub_baseline"))]
max_distance: f32,
}
pub const NUM_SUB_INSTANCES: usize = 4;

View File

@ -10,7 +10,10 @@ use std::collections::HashSet;
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Difficulty {
pub num_items: usize,
#[cfg(feature = "pub_baseline")]
pub better_than_baseline: u32,
#[cfg(not(feature = "pub_baseline"))]
better_than_baseline: u32,
}
impl From<Vec<i32>> for Difficulty {
@ -69,7 +72,10 @@ pub struct SubInstance {
pub values: Vec<u32>,
pub interaction_values: Vec<Vec<i32>>,
pub max_weight: u32,
#[cfg(feature = "pub_baseline")]
pub baseline_value: u32,
#[cfg(not(feature = "pub_baseline"))]
baseline_value: u32,
}
pub const NUM_SUB_INSTANCES: usize = 16;

View File

@ -11,7 +11,10 @@ use std::sync::Arc;
#[derive(Serialize, Deserialize, Debug, Copy, Clone)]
pub struct Difficulty {
pub num_queries: u32,
#[cfg(feature = "pub_baseline")]
pub better_than_baseline: u32,
#[cfg(not(feature = "pub_baseline"))]
better_than_baseline: u32,
}
impl From<Vec<i32>> for Difficulty {
@ -56,7 +59,10 @@ pub struct Challenge {
pub database_size: u32,
pub d_database_vectors: CudaSlice<f32>,
pub d_query_vectors: CudaSlice<f32>,
#[cfg(feature = "pub_baseline")]
pub max_distance: f32,
#[cfg(not(feature = "pub_baseline"))]
max_distance: f32,
}
pub const MAX_THREADS_PER_BLOCK: u32 = 1024;

View File

@ -11,7 +11,10 @@ use std::collections::{HashMap, HashSet};
#[derive(Serialize, Deserialize, Debug, Copy, Clone)]
pub struct Difficulty {
pub num_nodes: usize,
#[cfg(feature = "pub_baseline")]
pub better_than_baseline: u32,
#[cfg(not(feature = "pub_baseline"))]
better_than_baseline: u32,
}
impl From<Vec<i32>> for Difficulty {
@ -68,7 +71,10 @@ pub struct SubInstance {
pub difficulty: Difficulty,
pub demands: Vec<i32>,
pub distance_matrix: Vec<Vec<i32>>,
#[cfg(feature = "pub_baseline")]
pub baseline_total_distance: i32,
#[cfg(not(feature = "pub_baseline"))]
baseline_total_distance: i32,
pub max_capacity: i32,
pub fleet_size: usize,
pub service_time: i32,