feat: conformance tests pass for first time
Change implementation to exponentially increase search space at each level.
This commit is contained in:
parent
31c454a78c
commit
546d6deb69
GPG key ID:
D460CD54A9E3AB86
13 changed files with 1852 additions and 102 deletions
204
conformance-tests/generator/Cargo.lock
generated
Normal file
204
conformance-tests/generator/Cargo.lock
generated
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "conformance-test-generator"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"peoplesgrocers-lseq",
|
||||
"rand",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.178"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||
|
||||
[[package]]
|
||||
name = "peoplesgrocers-lseq"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
||||
dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.103"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.228"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_core"
|
||||
version = "1.0.228"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.228"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.145"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
"ryu",
|
||||
"serde",
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.111"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.1+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
10
conformance-tests/generator/Cargo.toml
Normal file
10
conformance-tests/generator/Cargo.toml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
[package]
|
||||
name = "conformance-test-generator"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
peoplesgrocers-lseq = { path = "../../rust" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
rand = "0.8"
|
||||
254
conformance-tests/generator/src/main.rs
Normal file
254
conformance-tests/generator/src/main.rs
Normal file
|
|
@ -0,0 +1,254 @@
|
|||
mod model;
|
||||
|
||||
use model::{Insert, Scenario};
|
||||
use peoplesgrocers_lseq::{LseqRng, SortKey, LSEQ};
|
||||
use rand::{rngs::StdRng, Rng, SeedableRng};
|
||||
use std::fs;
|
||||
|
||||
/// A recording RNG wrapper that records random values as floats
|
||||
/// compatible with TypeScript's Math.random() consumption pattern.
|
||||
struct RecordingRng {
|
||||
inner: StdRng,
|
||||
recorded: Vec<f64>,
|
||||
}
|
||||
|
||||
impl RecordingRng {
|
||||
fn new(seed: u64) -> Self {
|
||||
RecordingRng {
|
||||
inner: StdRng::seed_from_u64(seed),
|
||||
recorded: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn take_recorded(&mut self) -> Vec<f64> {
|
||||
std::mem::take(&mut self.recorded)
|
||||
}
|
||||
}
|
||||
|
||||
impl LseqRng for RecordingRng {
|
||||
fn gen_bool(&mut self, p: f64) -> bool {
|
||||
// Use fully qualified syntax to call rand::Rng method
|
||||
let result = Rng::gen_bool(&mut self.inner, p);
|
||||
// Record a float that TypeScript's `f < p` would produce the same result
|
||||
// If result is true, we need f < p, so use p/2
|
||||
// If result is false, we need f >= p, so use (1 + p) / 2
|
||||
let recorded_value = if result { p / 2.0 } else { (1.0 + p) / 2.0 };
|
||||
self.recorded.push(recorded_value);
|
||||
result
|
||||
}
|
||||
|
||||
fn gen_range(&mut self, range: std::ops::Range<u64>) -> u64 {
|
||||
// Use fully qualified syntax to call rand::Rng method
|
||||
let result: u64 = Rng::gen_range(&mut self.inner, range.clone());
|
||||
// Record a float that TypeScript's `Math.floor(f * range_size)` would produce the same result
|
||||
// For result r in [0, range_size), we need floor(f * range_size) = r
|
||||
// So f should be in [r/range_size, (r+1)/range_size)
|
||||
// Use midpoint: (r + 0.5) / range_size
|
||||
let range_size = (range.end - range.start) as f64;
|
||||
let relative_result = (result - range.start) as f64;
|
||||
let recorded_value = (relative_result + 0.5) / range_size;
|
||||
self.recorded.push(recorded_value);
|
||||
result
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn generate_scenario(
|
||||
name: &str,
|
||||
description: &str,
|
||||
seed: u64,
|
||||
init: Vec<&str>,
|
||||
ops: impl FnOnce(&mut LSEQ<RecordingRng>, &mut Vec<String>) -> Vec<Insert>,
|
||||
) -> Scenario {
|
||||
let mut lseq = LSEQ::new(RecordingRng::new(seed));
|
||||
let mut state: Vec<String> = init.iter().map(|s| s.to_string()).collect();
|
||||
let operations = ops(&mut lseq, &mut state);
|
||||
|
||||
Scenario {
|
||||
name: name.to_string(),
|
||||
description: description.to_string(),
|
||||
seed,
|
||||
init: init.iter().map(|s| s.to_string()).collect(),
|
||||
rng: lseq.take_rng().take_recorded(),
|
||||
operations,
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let scenarios = vec![
|
||||
// 01 - Sequential append
|
||||
generate_scenario(
|
||||
"sequential-append",
|
||||
"20 inserts, each after the last",
|
||||
42,
|
||||
vec![],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
for _ in 0..20 {
|
||||
let before_key = state.last().map(|s| s.parse::<SortKey>().unwrap());
|
||||
let result = lseq.alloc(before_key.as_ref(), None);
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::After {
|
||||
index: -1, // after last element (or beginning if empty)
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.push(result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
// 02 - Sequential prepend
|
||||
generate_scenario(
|
||||
"sequential-prepend",
|
||||
"20 inserts, each before the first",
|
||||
43,
|
||||
vec![],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
for _ in 0..20 {
|
||||
let after_key = state.first().map(|s| s.parse::<SortKey>().unwrap());
|
||||
let result = lseq.alloc(None, after_key.as_ref());
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::Before {
|
||||
index: 0, // before first element (prepend)
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.insert(0, result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
// 03 - Random insert 100 items
|
||||
generate_scenario(
|
||||
"random-insert-100-items",
|
||||
"100 inserts at random positions",
|
||||
44,
|
||||
vec![],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
let mut position_rng = StdRng::seed_from_u64(100); // Separate RNG for positions
|
||||
|
||||
for _ in 0..100 {
|
||||
// Pick a random insertion point (0..=state.len())
|
||||
let idx = if state.is_empty() {
|
||||
0
|
||||
} else {
|
||||
Rng::gen_range(&mut position_rng, 0..=state.len())
|
||||
};
|
||||
|
||||
// Derive beforeKey and afterKey from the insertion index
|
||||
let before_key = if idx > 0 {
|
||||
Some(state[idx - 1].parse::<SortKey>().unwrap())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let after_key = if idx < state.len() {
|
||||
Some(state[idx].parse::<SortKey>().unwrap())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let result = lseq.alloc(before_key.as_ref(), after_key.as_ref());
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::Before {
|
||||
index: idx as i32,
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.insert(idx, result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
// 04 - Dense packing
|
||||
generate_scenario(
|
||||
"dense-packing",
|
||||
"20 inserts between adjacent keys '0' and '1'",
|
||||
45,
|
||||
vec!["0", "1"],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
// Always insert between first and second element
|
||||
for _ in 0..20 {
|
||||
let before_key = state[0].parse::<SortKey>().unwrap();
|
||||
let after_key = state[1].parse::<SortKey>().unwrap();
|
||||
let result = lseq.alloc(Some(&before_key), Some(&after_key));
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::Before {
|
||||
index: 1, // between state[0] and state[1]
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.insert(1, result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
// 05 - Deep nesting
|
||||
generate_scenario(
|
||||
"deep-nesting",
|
||||
"Force 5+ level deep keys by inserting between adjacent keys",
|
||||
46,
|
||||
vec!["M", "N"],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
// Keep inserting between first two to force depth
|
||||
for _ in 0..30 {
|
||||
let before_key = state[0].parse::<SortKey>().unwrap();
|
||||
let after_key = state[1].parse::<SortKey>().unwrap();
|
||||
let result = lseq.alloc(Some(&before_key), Some(&after_key));
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::Before {
|
||||
index: 1, // between state[0] and state[1]
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.insert(1, result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
// 06 - Edge min interval
|
||||
generate_scenario(
|
||||
"edge-min-interval",
|
||||
"Insert between adjacent keys (A, B) which have interval=1",
|
||||
47,
|
||||
vec!["A", "B"],
|
||||
|lseq, state| {
|
||||
let mut ops = Vec::new();
|
||||
for _ in 0..10 {
|
||||
let before_key = state[0].parse::<SortKey>().unwrap();
|
||||
let after_key = state[1].parse::<SortKey>().unwrap();
|
||||
let result = lseq.alloc(Some(&before_key), Some(&after_key));
|
||||
let result_str = result.to_string();
|
||||
|
||||
ops.push(Insert::Before {
|
||||
index: 1, // between state[0] and state[1]
|
||||
outcome: result_str.clone(),
|
||||
});
|
||||
|
||||
state.insert(1, result_str);
|
||||
}
|
||||
ops
|
||||
},
|
||||
),
|
||||
];
|
||||
|
||||
// Write each scenario to a file
|
||||
let output_dir = "../genfiles";
|
||||
fs::create_dir_all(output_dir).expect("Failed to create genfiles directory");
|
||||
|
||||
for (i, scenario) in scenarios.iter().enumerate() {
|
||||
let filename = format!("{}/{:02}-{}.scenario.json", output_dir, i + 1, scenario.name);
|
||||
let json = serde_json::to_string_pretty(scenario).expect("Failed to serialize scenario");
|
||||
fs::write(&filename, json).expect("Failed to write scenario file");
|
||||
println!("Generated: {}", filename);
|
||||
}
|
||||
}
|
||||
46
conformance-tests/generator/src/model.rs
Normal file
46
conformance-tests/generator/src/model.rs
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
use serde::ser::{SerializeMap, Serializer};
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct Scenario {
|
||||
pub name: String,
|
||||
pub description: String,
|
||||
pub seed: u64,
|
||||
pub init: Vec<String>,
|
||||
pub rng: Vec<f64>,
|
||||
pub operations: Vec<Insert>,
|
||||
}
|
||||
|
||||
/// Specifies an insertion point in the sequence.
|
||||
///
|
||||
/// - `Insert::Before { index: 3, .. }` → insert before state[3]
|
||||
/// - `Insert::Before { index: 0, .. }` → insert at start
|
||||
/// - `Insert::After { index: 2, .. }` → insert after state[2]
|
||||
/// - `Insert::After { index: -1, .. }` → insert at end (Python-style negative index)
|
||||
///
|
||||
/// Serializes to `{ "before": n, "expected": "..." }` or `{ "after": n, "expected": "..." }`.
|
||||
#[derive(Debug)]
|
||||
pub enum Insert {
|
||||
Before { index: i32, outcome: String },
|
||||
After { index: i32, outcome: String },
|
||||
}
|
||||
|
||||
impl Serialize for Insert {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
let mut map = serializer.serialize_map(Some(2))?;
|
||||
match self {
|
||||
Insert::Before { index, outcome } => {
|
||||
map.serialize_entry("before", index)?;
|
||||
map.serialize_entry("expected", outcome)?;
|
||||
}
|
||||
Insert::After { index, outcome } => {
|
||||
map.serialize_entry("after", index)?;
|
||||
map.serialize_entry("expected", outcome)?;
|
||||
}
|
||||
}
|
||||
map.end()
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue