Skip to content

Commit 9940a5d

Browse files
GiggleLiuclaude
andcommitted
chore: format code and regenerate reduction graph artifacts
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 979564c commit 9940a5d

21 files changed

Lines changed: 72 additions & 78 deletions

docs/src/reductions/reduction_graph.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,72 @@
33
{
44
"name": "BMF",
55
"variant": {},
6-
"category": "specialized",
7-
"doc_path": "models/specialized/struct.BMF.html",
6+
"category": "algebraic",
7+
"doc_path": "models/algebraic/struct.BMF.html",
88
"complexity": "2^(rows * rank + rank * cols)"
99
},
1010
{
1111
"name": "BicliqueCover",
1212
"variant": {},
13-
"category": "specialized",
14-
"doc_path": "models/specialized/struct.BicliqueCover.html",
13+
"category": "graph",
14+
"doc_path": "models/graph/struct.BicliqueCover.html",
1515
"complexity": "2^num_vertices"
1616
},
1717
{
1818
"name": "BinPacking",
1919
"variant": {
2020
"weight": "f64"
2121
},
22-
"category": "optimization",
23-
"doc_path": "models/optimization/struct.BinPacking.html",
22+
"category": "misc",
23+
"doc_path": "models/misc/struct.BinPacking.html",
2424
"complexity": "2^num_items"
2525
},
2626
{
2727
"name": "BinPacking",
2828
"variant": {
2929
"weight": "i32"
3030
},
31-
"category": "optimization",
32-
"doc_path": "models/optimization/struct.BinPacking.html",
31+
"category": "misc",
32+
"doc_path": "models/misc/struct.BinPacking.html",
3333
"complexity": "2^num_items"
3434
},
3535
{
3636
"name": "CircuitSAT",
3737
"variant": {},
38-
"category": "specialized",
39-
"doc_path": "models/specialized/struct.CircuitSAT.html",
38+
"category": "formula",
39+
"doc_path": "models/formula/struct.CircuitSAT.html",
4040
"complexity": "2^num_variables"
4141
},
4242
{
4343
"name": "ClosestVectorProblem",
4444
"variant": {
4545
"weight": "f64"
4646
},
47-
"category": "optimization",
48-
"doc_path": "models/optimization/struct.ClosestVectorProblem.html",
47+
"category": "algebraic",
48+
"doc_path": "models/algebraic/struct.ClosestVectorProblem.html",
4949
"complexity": "2^num_basis_vectors"
5050
},
5151
{
5252
"name": "ClosestVectorProblem",
5353
"variant": {
5454
"weight": "i32"
5555
},
56-
"category": "optimization",
57-
"doc_path": "models/optimization/struct.ClosestVectorProblem.html",
56+
"category": "algebraic",
57+
"doc_path": "models/algebraic/struct.ClosestVectorProblem.html",
5858
"complexity": "2^num_basis_vectors"
5959
},
6060
{
6161
"name": "Factoring",
6262
"variant": {},
63-
"category": "specialized",
64-
"doc_path": "models/specialized/struct.Factoring.html",
63+
"category": "misc",
64+
"doc_path": "models/misc/struct.Factoring.html",
6565
"complexity": "exp((m + n)^(1/3) * log(m + n)^(2/3))"
6666
},
6767
{
6868
"name": "ILP",
6969
"variant": {},
70-
"category": "optimization",
71-
"doc_path": "models/optimization/struct.ILP.html",
70+
"category": "algebraic",
71+
"doc_path": "models/algebraic/struct.ILP.html",
7272
"complexity": "num_variables^num_variables"
7373
},
7474
{
@@ -126,26 +126,26 @@
126126
"variant": {
127127
"k": "K2"
128128
},
129-
"category": "satisfiability",
130-
"doc_path": "models/satisfiability/struct.KSatisfiability.html",
129+
"category": "formula",
130+
"doc_path": "models/formula/struct.KSatisfiability.html",
131131
"complexity": "num_variables + num_clauses"
132132
},
133133
{
134134
"name": "KSatisfiability",
135135
"variant": {
136136
"k": "K3"
137137
},
138-
"category": "satisfiability",
139-
"doc_path": "models/satisfiability/struct.KSatisfiability.html",
138+
"category": "formula",
139+
"doc_path": "models/formula/struct.KSatisfiability.html",
140140
"complexity": "1.307^num_variables"
141141
},
142142
{
143143
"name": "KSatisfiability",
144144
"variant": {
145145
"k": "KN"
146146
},
147-
"category": "satisfiability",
148-
"doc_path": "models/satisfiability/struct.KSatisfiability.html",
147+
"category": "formula",
148+
"doc_path": "models/formula/struct.KSatisfiability.html",
149149
"complexity": "2^num_variables"
150150
},
151151
{
@@ -317,24 +317,24 @@
317317
{
318318
"name": "PaintShop",
319319
"variant": {},
320-
"category": "specialized",
321-
"doc_path": "models/specialized/struct.PaintShop.html",
320+
"category": "misc",
321+
"doc_path": "models/misc/struct.PaintShop.html",
322322
"complexity": "2^num_cars"
323323
},
324324
{
325325
"name": "QUBO",
326326
"variant": {
327327
"weight": "f64"
328328
},
329-
"category": "optimization",
330-
"doc_path": "models/optimization/struct.QUBO.html",
329+
"category": "algebraic",
330+
"doc_path": "models/algebraic/struct.QUBO.html",
331331
"complexity": "2^num_vars"
332332
},
333333
{
334334
"name": "Satisfiability",
335335
"variant": {},
336-
"category": "satisfiability",
337-
"doc_path": "models/satisfiability/struct.Satisfiability.html",
336+
"category": "formula",
337+
"doc_path": "models/formula/struct.Satisfiability.html",
338338
"complexity": "2^num_variables"
339339
},
340340
{
@@ -343,8 +343,8 @@
343343
"graph": "SimpleGraph",
344344
"weight": "f64"
345345
},
346-
"category": "optimization",
347-
"doc_path": "models/optimization/struct.SpinGlass.html",
346+
"category": "graph",
347+
"doc_path": "models/graph/struct.SpinGlass.html",
348348
"complexity": "2^num_spins"
349349
},
350350
{
@@ -353,8 +353,8 @@
353353
"graph": "SimpleGraph",
354354
"weight": "i32"
355355
},
356-
"category": "optimization",
357-
"doc_path": "models/optimization/struct.SpinGlass.html",
356+
"category": "graph",
357+
"doc_path": "models/graph/struct.SpinGlass.html",
358358
"complexity": "2^num_spins"
359359
},
360360
{

problemreductions-cli/src/mcp/tools.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
use crate::util;
2+
use problemreductions::models::algebraic::QUBO;
3+
use problemreductions::models::formula::{CNFClause, Satisfiability};
24
use problemreductions::models::graph::{
35
MaxCut, MaximumClique, MaximumIndependentSet, MaximumMatching, MinimumDominatingSet,
4-
MinimumVertexCover, TravelingSalesman,
6+
MinimumVertexCover, SpinGlass, TravelingSalesman,
57
};
6-
use problemreductions::models::algebraic::QUBO;
7-
use problemreductions::models::formula::{CNFClause, Satisfiability};
8-
use problemreductions::models::graph::SpinGlass;
98
use problemreductions::models::misc::Factoring;
109
use problemreductions::registry::collect_schemas;
1110
use problemreductions::rules::{

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ pub mod variant;
3636
/// Prelude module for convenient imports.
3737
pub mod prelude {
3838
// Problem types
39+
pub use crate::models::algebraic::{BMF, QUBO};
40+
pub use crate::models::formula::{CNFClause, CircuitSAT, KSatisfiability, Satisfiability};
41+
pub use crate::models::graph::{BicliqueCover, SpinGlass};
3942
pub use crate::models::graph::{
4043
KColoring, MaxCut, MaximalIS, MaximumClique, MaximumIndependentSet, MaximumMatching,
4144
MinimumDominatingSet, MinimumVertexCover, TravelingSalesman,
4245
};
43-
pub use crate::models::algebraic::{QUBO, BMF};
44-
pub use crate::models::formula::{CNFClause, CircuitSAT, KSatisfiability, Satisfiability};
45-
pub use crate::models::graph::{BicliqueCover, SpinGlass};
4646
pub use crate::models::misc::{BinPacking, Factoring, PaintShop};
4747
pub use crate::models::set::{MaximumSetPacking, MinimumSetCovering};
4848

src/models/formula/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
//! - [`KSatisfiability`]: K-SAT where each clause has exactly K literals
66
//! - [`CircuitSAT`]: Boolean circuit satisfiability
77
8+
pub(crate) mod circuit;
89
mod ksat;
910
mod sat;
10-
pub(crate) mod circuit;
1111

1212
pub use circuit::{Assignment, BooleanExpr, BooleanOp, Circuit, CircuitSAT};
1313
pub use ksat::KSatisfiability;

src/models/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub mod misc;
99
pub mod set;
1010

1111
// Re-export commonly used types
12-
pub use algebraic::{ClosestVectorProblem, ILP, QUBO, BMF};
12+
pub use algebraic::{ClosestVectorProblem, BMF, ILP, QUBO};
1313
pub use formula::{CNFClause, CircuitSAT, KSatisfiability, Satisfiability};
1414
pub use graph::{
1515
BicliqueCover, KColoring, MaxCut, MaximalIS, MaximumClique, MaximumIndependentSet,

src/rules/circuit_spinglass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//! Each logic gate is encoded as a SpinGlass Hamiltonian where the ground
77
//! states correspond to valid input/output combinations.
88
9-
use crate::models::graph::SpinGlass;
109
use crate::models::formula::{Assignment, BooleanExpr, BooleanOp, CircuitSAT};
10+
use crate::models::graph::SpinGlass;
1111
use crate::reduction;
1212
use crate::rules::traits::{ReduceTo, ReductionResult};
1313
use crate::topology::SimpleGraph;

src/rules/coloring_ilp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//! 2. Adjacent vertices have different colors: x_{u,c} + x_{v,c} <= 1 for each edge (u,v) and color c
88
//! - Objective: None (feasibility problem, minimize 0)
99
10-
use crate::models::graph::KColoring;
1110
use crate::models::algebraic::{LinearConstraint, ObjectiveSense, VarBounds, ILP};
11+
use crate::models::graph::KColoring;
1212
use crate::reduction;
1313
use crate::rules::traits::{ReduceTo, ReductionResult};
1414
use crate::topology::{Graph, SimpleGraph};

src/rules/coloring_qubo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
//!
99
//! QUBO has n*K variables.
1010
11-
use crate::models::graph::KColoring;
1211
use crate::models::algebraic::QUBO;
12+
use crate::models::graph::KColoring;
1313
use crate::reduction;
1414
use crate::rules::traits::{ReduceTo, ReductionResult};
1515
use crate::topology::{Graph, SimpleGraph};

src/rules/maximumclique_ilp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//! at most one can be in the clique
77
//! - Objective: Maximize the sum of weights of selected vertices
88
9-
use crate::models::graph::MaximumClique;
109
use crate::models::algebraic::{LinearConstraint, ObjectiveSense, VarBounds, ILP};
10+
use crate::models::graph::MaximumClique;
1111
use crate::reduction;
1212
use crate::rules::traits::{ReduceTo, ReductionResult};
1313
use crate::topology::{Graph, SimpleGraph};

src/rules/maximumindependentset_ilp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//! - Constraints: x_u + x_v <= 1 for each edge (u, v) - at most one endpoint can be selected
66
//! - Objective: Maximize the sum of weights of selected vertices
77
8-
use crate::models::graph::MaximumIndependentSet;
98
use crate::models::algebraic::{LinearConstraint, ObjectiveSense, VarBounds, ILP};
9+
use crate::models::graph::MaximumIndependentSet;
1010
use crate::reduction;
1111
use crate::rules::traits::{ReduceTo, ReductionResult};
1212
use crate::topology::{Graph, SimpleGraph};

0 commit comments

Comments
 (0)