Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit how many times each input can be used #47

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Limit how many times each input can be used #47

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e1229
Limit how many times each input can be used
4atj Apr 8, 2024
815986e
Avoid heap allocation
4atj Apr 8, 2024
cdcbeed
Input validation for `min_uses` & `max_uses`; `has_unlimited_var()` c…
4atj Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ use crate::{
vec::Vector,
};

pub type Mask = u8;
pub type VarCount = [u8; INPUTS.len()];

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Expr {
pub left: Option<NonNull<Expr>>,
pub right: Option<NonNull<Expr>>,
pub op_idx: OpIndex,
pub var_mask: Mask,
pub var_count: VarCount,
pub output: Vector,
}
unsafe impl Send for Expr {}
Expand All @@ -26,11 +26,13 @@ impl Expr {
}

pub fn variable(index: usize, output: Vector) -> Self {
let mut var_count = [0; INPUTS.len()];
var_count[index] = 1;
Self {
left: None,
right: None,
op_idx: OP_INDEX_VARIABLE,
var_mask: 1 << index,
var_count: var_count,
output,
}
}
Expand All @@ -40,27 +42,27 @@ impl Expr {
left: None,
right: None,
op_idx: OP_INDEX_LITERAL,
var_mask: 0,
var_count: [0; INPUTS.len()],
output: Vector::constant(value),
}
}

pub fn is_literal(&self) -> bool {
self.var_mask == 0
self.var_count.iter().all(|&var_count| var_count == 0)
}

pub fn bin(
el: NonNull<Expr>,
er: NonNull<Expr>,
op_idx: OpIndex,
var_mask: Mask,
var_count: VarCount,
output: Vector,
) -> Self {
Self {
left: Some(el),
right: Some(er),
op_idx,
var_mask,
var_count,
output,
}
}
Expand All @@ -70,7 +72,7 @@ impl Expr {
left: None,
right: Some(er.into()),
op_idx,
var_mask: er.var_mask,
var_count: er.var_count,
output,
}
}
Expand All @@ -80,7 +82,7 @@ impl Expr {
left: None,
right: Some(er.into()),
op_idx: OP_INDEX_PARENS,
var_mask: er.var_mask,
var_count: er.var_count,
output: er.output.clone(),
}
}
Expand All @@ -101,7 +103,7 @@ impl Display for Expr {
write!(
f,
"{}",
INPUTS[self.var_mask.trailing_zeros() as usize].name
INPUTS[self.var_count.iter().position(|&c| c == 1).unwrap()].name
)?;
} else {
write!(f, "{}", self.output[0])?;
Expand Down
46 changes: 34 additions & 12 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub mod params;
#[cfg_attr(not(feature = "simd"), path = "vec.rs")]
pub mod vec;

use expr::{Expr, Mask, NonNullExpr};
use expr::{Expr, NonNullExpr, VarCount};
use operator::*;
use params::*;

Expand All @@ -35,8 +35,13 @@ fn positive_integer_length(mut k: Num) -> usize {
l
}

fn can_use_required_vars(mask: u8, length: usize) -> bool {
!USE_ALL_VARS || length + (INPUTS.len() - (mask.count_ones() as usize)) * 2 <= MAX_LENGTH
fn can_use_required_vars(var_count: VarCount, length: usize) -> bool {
let missing_uses: u8 = var_count
.iter()
.zip(INPUTS.iter())
.map(|(&c, i)| (i.min_uses - std::cmp::min(c, i.min_uses)))
.sum();
length + missing_uses as usize * 2 <= MAX_LENGTH
}

fn is_leaf_expr(op_idx: OpIndex, length: usize) -> bool {
Expand All @@ -45,9 +50,13 @@ fn is_leaf_expr(op_idx: OpIndex, length: usize) -> bool {
}

fn save(level: &mut CacheLevel, expr: Expr, n: usize, cache: &Cache, hashset_cache: &HashSetCache) {
const ALL_MASK: Mask = (1 << INPUTS.len()) - 1;
let uses_required_vars = expr
.var_count
.iter()
.zip(INPUTS.iter())
.all(|(&c, i)| c >= i.min_uses);

if (!USE_ALL_VARS || expr.var_mask == ALL_MASK) && Matcher::match_all(&expr) {
if uses_required_vars && Matcher::match_all(&expr) {
println!("{expr}");
return;
}
Expand All @@ -56,7 +65,13 @@ fn save(level: &mut CacheLevel, expr: Expr, n: usize, cache: &Cache, hashset_cac
return;
}

if !REUSE_VARS && expr.var_mask == ALL_MASK {
let cant_use_more_vars = expr
.var_count
.iter()
.zip(INPUTS.iter())
.all(|(&c, i)| c == i.max_uses);

if cant_use_more_vars {
let mut mp: HashMap<Num, Num> = HashMap::new();
for i in 0..GOAL.len() {
if let Some(old) = mp.insert(expr.output[i], GOAL[i]) {
Expand Down Expand Up @@ -112,11 +127,18 @@ fn find_binary_operators(
if er.is_literal() && el.is_literal() {
return;
}
if !REUSE_VARS && (el.var_mask & er.var_mask != 0) {
let mut var_count = el.var_count;
for (l, &r) in var_count.iter_mut().zip(er.var_count.iter()) {
*l += r;
}
if var_count
.iter()
.zip(INPUTS.iter())
.any(|(&c, i)| c > i.max_uses)
{
return;
}
let mask = el.var_mask | er.var_mask;
if !can_use_required_vars(mask, n) {
if !can_use_required_vars(var_count, n) {
return;
}
seq!(idx in 0..100 {
Expand All @@ -140,7 +162,7 @@ fn find_binary_operators(
} else if let Some(output) = op.vec_apply(el.output.clone(), &er.output) {
save(
cn,
Expr::bin(el.into(), er.into(), op_idx, mask, output),
Expr::bin(el.into(), er.into(), op_idx, var_count, output),
n,
cache,
hashset_cache,
Expand Down Expand Up @@ -194,7 +216,7 @@ fn find_unary_operators(
n: usize,
er: &Expr,
) {
if !can_use_required_vars(er.var_mask, n) {
if !can_use_required_vars(er.var_count, n) {
return;
}
seq!(idx in 0..10 {
Expand Down Expand Up @@ -249,7 +271,7 @@ fn find_parens_expressions(
return;
}
for er in &cache[n - 2] {
if !can_use_required_vars(er.var_mask, n) {
if !can_use_required_vars(er.var_count, n) {
continue;
}
if er.op_idx < OP_INDEX_PARENS {
Expand Down
10 changes: 4 additions & 6 deletions src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ pub type Num = i32;
pub struct Input {
pub name: &'static str,
pub vec: &'static [Num],
pub min_uses: u8,
pub max_uses: u8,
}

pub const INPUTS: &[Input] = &[Input {
name: "n",
vec: &['E' as i32, 'W' as i32, 'N' as i32, 'S' as i32],
min_uses: 1,
max_uses: 255,
}];

pub struct Matcher {}
Expand Down Expand Up @@ -101,9 +105,3 @@ pub const UNARY_OPERATORS: &[UnaryOp] = &[

/// Match leaf expressions 1 output at a time to avoid unnecessary precalculations
pub const MATCH_1BY1: bool = true;

/// Search expressions that use the same variable twice (like `x*x`).
pub const REUSE_VARS: bool = true;

/// Controls whether all declared variables should be always used.
pub const USE_ALL_VARS: bool = true;
Loading