update

Author: GiggleLiu

Makefile

@@ -26,7 +26,6 @@ help:
 	@echo "  compare      - Generate and compare Rust mapping exports"
 	@echo "  examples     - Generate example JSON for paper (from fixtures, fast)"
 	@echo "  regenerate-fixtures - Recompute example DB fixtures (BruteForce/ILP, slow)"
-	@echo "  regenerate-fixtures - Recompute example DB fixtures (BruteForce/ILP, slow)"
 	@echo "  export-schemas - Export problem schemas to JSON"
 	@echo "  qubo-testdata - Regenerate QUBO test data (requires uv)"
 	@echo "  jl-testdata  - Regenerate Julia parity test data (requires julia)"
@@ -124,10 +123,6 @@ examples:
 regenerate-fixtures:
 	cargo run --release --features "example-db" --example regenerate_fixtures
 
-# Regenerate example DB fixtures from code (runs BruteForce/ILP — slow)
-regenerate-fixtures:
-	cargo run --release --features "example-db" --example regenerate_fixtures
-
 # Export problem schemas to JSON
 export-schemas:
 	cargo run --example export_schemas

docs/paper/reductions.typ

@@ -16,11 +16,15 @@
 
 // === Example JSON helpers ===
 // Load canonical example databases generated by `make examples`.
-#let rule-db = json("examples/generated/rules.json")
-#let model-db = json("examples/generated/models.json")
-
-#let load-example(source, target) = {
-  let matches = rule-db.rules.filter(r => r.source.problem == source and r.target.problem == target)
+#let example-db = json("examples/generated/examples.json")
+
+#let load-example(source, target, source-variant: none, target-variant: none) = {
+  let matches = example-db.rules.filter(r =>
+    r.source.problem == source and
+    r.target.problem == target and
+    (source-variant == none or r.source.variant == source-variant) and
+    (target-variant == none or r.target.variant == target-variant)
+  )
   if matches.len() == 1 {
     matches.at(0)
   } else if matches.len() == 0 {
@@ -30,8 +34,11 @@
   }
 }
 
-#let load-model-example(name) = {
-  let matches = model-db.models.filter(m => m.problem == name)
+#let load-model-example(name, variant: none) = {
+  let matches = example-db.models.filter(m =>
+    m.problem == name and
+    (variant == none or m.variant == variant)
+  )
   if matches.len() == 1 {
     matches.at(0)
   } else if matches.len() == 0 {
@@ -275,6 +282,8 @@
 #let reduction-rule(
   source, target,
   example: false,
+  example-source-variant: none,
+  example-target-variant: none,
   example-caption: none,
   extra: none,
   theorem-body, proof-body,
@@ -301,7 +310,12 @@
   proof[#proof-body]
 
   if example {
-    let data = load-example(source, target)
+    let data = load-example(
+      source,
+      target,
+      source-variant: example-source-variant,
+      target-variant: example-target-variant,
+    )
     pad(left: 1.5em, reduction-example(data, caption: example-caption)[#extra])
   }
 }
@@ -376,8 +390,8 @@ The gray schema table shows the JSON field names used in the library's data stru
 In all graph problems below, $G = (V, E)$ denotes an undirected graph with $|V| = n$ vertices and $|E|$ edges.
 
 #{
-  // MIS has two entries in models.json; select the unit-weight variant
-  let x = model-db.models.filter(m => m.problem == "MaximumIndependentSet" and m.variant.at("weight", default: "") == "One").at(0)
+  // MIS has two entries in examples.json; select the unit-weight variant
+  let x = load-model-example("MaximumIndependentSet", variant: (graph: "SimpleGraph", weight: "One"))
   let nv = graph-num-vertices(x.instance)
   let ne = graph-num-edges(x.instance)
   // Pick optimal[2] = {v1, v3, v5, v9} to match figure
@@ -2772,17 +2786,26 @@ The following table shows concrete variable overhead for example instances, gene
 #let example-files = (
   (source: "MaximumIndependentSet", target: "MinimumVertexCover"),
   (source: "MinimumVertexCover", target: "MaximumIndependentSet"),
-  (source: "MaximumIndependentSet", target: "MaximumSetPacking"),
+  (
+    source: "MaximumIndependentSet",
+    target: "MaximumSetPacking",
+    source-variant: (graph: "SimpleGraph", weight: "One"),
+    target-variant: (weight: "One"),
+  ),
   (source: "MaximumMatching", target: "MaximumSetPacking"),
   (source: "MinimumVertexCover", target: "MinimumSetCovering"),
   (source: "MaxCut", target: "SpinGlass"),
   (source: "SpinGlass", target: "MaxCut"),
   (source: "SpinGlass", target: "QUBO"),
   (source: "QUBO", target: "SpinGlass"),
-  (source: "MaximumIndependentSet", target: "QUBO"),
   (source: "KColoring", target: "QUBO"),
   (source: "MaximumSetPacking", target: "QUBO"),
-  (source: "KSatisfiability", target: "QUBO"),
+  (
+    source: "KSatisfiability",
+    target: "QUBO",
+    source-variant: (k: "K3"),
+    target-variant: (weight: "f64"),
+  ),
   (source: "ILP", target: "QUBO"),
   (source: "Satisfiability", target: "MaximumIndependentSet"),
   (source: "Satisfiability", target: "KColoring"),
@@ -2801,7 +2824,12 @@ The following table shows concrete variable overhead for example instances, gene
 )
 
 #let examples = example-files.map(entry => {
-  let d = load-example(entry.source, entry.target)
+  let d = load-example(
+    entry.source,
+    entry.target,
+    source-variant: entry.at("source-variant", default: none),
+    target-variant: entry.at("target-variant", default: none),
+  )
   (name: example-name(entry.source, entry.target), data: d)
 })
 

examples/export_examples.rs

@@ -1,5 +1,5 @@
-use problemreductions::example_db::{build_model_db, build_rule_db, default_generated_dir};
-use problemreductions::export::{write_model_db_to, write_rule_db_to};
+use problemreductions::example_db::{build_example_db, default_generated_dir};
+use problemreductions::export::write_example_db_to;
 use std::fs;
 
 fn main() {
@@ -9,15 +9,13 @@ fn main() {
     }
     fs::create_dir_all(&output_dir).expect("Failed to create generated examples directory");
 
-    let rule_db = build_rule_db().expect("Failed to build canonical rule database");
-    let model_db = build_model_db().expect("Failed to build canonical model database");
+    let example_db = build_example_db().expect("Failed to build canonical example database");
 
-    write_rule_db_to(&output_dir, &rule_db);
-    write_model_db_to(&output_dir, &model_db);
+    write_example_db_to(&output_dir, &example_db);
 
     println!(
         "Exported {} rule examples and {} model examples",
-        rule_db.rules.len(),
-        model_db.models.len()
+        example_db.rules.len(),
+        example_db.models.len()
     );
 }

examples/regenerate_fixtures.rs

@@ -1,36 +1,31 @@
 /// Regenerate example database fixture files from builder code.
 ///
 /// This binary recomputes all model and rule examples using BruteForce/ILP
-/// and writes them to `src/example_db/fixtures/` as JSON Lines, one example per
-/// line. Run this in release mode after changing any model or rule to update
-/// the stored expected results:
+/// and writes them to `src/example_db/fixtures/` as wrapped JSON objects. Run
+/// this in release mode after changing any model or rule to update the stored
+/// expected results:
 ///
 /// ```
 /// cargo run --release --example regenerate_fixtures --features example-db
 /// ```
-use problemreductions::example_db::{compute_model_db, compute_rule_db};
-use problemreductions::export::{write_model_db_to, write_rule_db_to};
+use problemreductions::example_db::compute_example_db;
+use problemreductions::export::write_example_db_to;
 use std::fs;
 use std::path::Path;
 
 fn main() {
     let fixtures_dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("src/example_db/fixtures");
     fs::create_dir_all(&fixtures_dir).expect("Failed to create fixtures directory");
 
-    let rule_db = compute_rule_db().expect("Failed to compute canonical rule database");
-    let model_db = compute_model_db().expect("Failed to compute canonical model database");
+    let example_db = compute_example_db().expect("Failed to compute canonical example database");
+    let examples_path = fixtures_dir.join("examples.json");
 
-    let models_path = fixtures_dir.join("models.json");
-    let rules_path = fixtures_dir.join("rules.json");
-
-    write_model_db_to(&fixtures_dir, &model_db);
-    write_rule_db_to(&fixtures_dir, &rule_db);
+    write_example_db_to(&fixtures_dir, &example_db);
 
     println!(
         "Regenerated fixtures: {} rule examples, {} model examples",
-        rule_db.rules.len(),
-        model_db.models.len()
+        example_db.rules.len(),
+        example_db.models.len()
     );
-    println!("  Models: {}", models_path.display());
-    println!("  Rules: {}", rules_path.display());
+    println!("  Examples: {}", examples_path.display());
 }