Skip to content

Commit

Permalink
prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
chrjabs committed Sep 5, 2023
1 parent bbba21f commit 48dfbdd
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/target
/derive/target
/derive/Cargo.lock
/proc/target
/proc/Cargo.lock
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.2.0"
edition = "2021"
license = "MIT"
description = "A multi-objective MaxSAT solver."
keyworks = ["solver", "multi-objective optimization", "maxsat"]
keywords = ["solver", "multi-objective", "maxsat"]
repository = "https://github.com/chrjabs/scuttle"
readme = "README.md"

Expand All @@ -21,16 +21,16 @@ concolor-clap = { optional = true, version = "0.1.0" }
termcolor = { optional = true, version = "1.2.0" }
atty = { optional = true, version = "0.2.14" }
signal-hook = { optional = true, version = "0.3.15" }
scuttle_derive = { path = "./derive" }
scuttle-proc = { version = "0.1", path = "./proc" }

[build-dependencies]
rustsat-cadical = { version = "0.1", path = "../rustsat/cadical", features = ["v1-7-1"] }

[features]
default = ["build-binary", "phasing", "sol-tightening"]
oracle-term = ["scuttle_derive/oracle-term"]
phasing = ["scuttle_derive/phasing"]
sol-tightening = ["scuttle_derive/sol-tightening"]
oracle-term = ["scuttle-proc/oracle-term"]
phasing = ["scuttle-proc/phasing"]
sol-tightening = ["scuttle-proc/sol-tightening"]
build-binary = [
"dep:clap",
"dep:concolor-clap",
Expand Down
6 changes: 3 additions & 3 deletions derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "scuttle_derive"
name = "scuttle-proc"
authors = ["Christoph Jabs <[email protected]>"]
license = "MIT"
description = "Procedural derive macros for scuttle"
keyworks = ["solver", "multi-objective optimization", "maxsat"]
description = "Procedural macros for scuttle. These macros are not intended to be used outside of scuttle."
keywords = ["solver", "multi-objective optimization", "maxsat"]
repository = "https://github.com/chrjabs/scuttle"
version = "0.1.0"
edition = "2021"
Expand Down
24 changes: 24 additions & 0 deletions proc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[package]
name = "scuttle-proc"
authors = ["Christoph Jabs <[email protected]>"]
license = "MIT"
description = "Procedural macros for scuttle. This crate is not intended to be used outside of scuttle."
keywords = ["solver", "multi-objective", "maxsat"]
repository = "https://github.com/chrjabs/scuttle"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
proc-macro = true

[dependencies]
syn = "2.0"
quote = "1.0"
darling = "0.20"

[features]
oracle-term = []
phasing = []
sol-tightening = []
File renamed without changes.
2 changes: 1 addition & 1 deletion src/solver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use rustsat::{
solvers::{ControlSignal, SolveIncremental, SolverResult},
types::{Assignment, Clause, Lit, LitIter, RsHashMap, TernaryVal, Var, WLitIter},
};
use scuttle_derive::oracle_bounds;
use scuttle_proc::oracle_bounds;

use crate::{
options::EnumOptions,
Expand Down
2 changes: 1 addition & 1 deletion src/solver/lowerbounding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use rustsat::{
solvers::{ControlSignal, SolveIncremental, SolveStats, SolverResult, SolverStats},
types::{Assignment, Clause, Lit},
};
use scuttle_derive::{oracle_bounds, KernelFunctions, Solve};
use scuttle_proc::{oracle_bounds, KernelFunctions, Solve};

use crate::{
types::ParetoFront, EncodingStats, ExtendedSolveStats, KernelFunctions, Limits, Options, Phase,
Expand Down
2 changes: 1 addition & 1 deletion src/solver/pminimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use rustsat::{
solvers::{ControlSignal, SolveIncremental, SolveStats, SolverResult, SolverStats},
types::{Assignment, Clause},
};
use scuttle_derive::{oracle_bounds, KernelFunctions, Solve};
use scuttle_proc::{oracle_bounds, KernelFunctions, Solve};

use super::{default_blocking_clause, Objective, SolverKernel};

Expand Down

0 comments on commit 48dfbdd

Please sign in to comment.