Skip to content

Clean up #1

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

Open
sloganking wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Clean up #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5659532
remove unused struct definition
sloganking Oct 19, 2022
47252b3
format
sloganking Oct 19, 2022
e97fdfa
fix most of clippy
sloganking Oct 19, 2022
c94308f
remove useless comment
sloganking Oct 19, 2022
4f28ad6
Put StartInfo back
sloganking Oct 19, 2022
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
65 changes: 31 additions & 34 deletions src/bin/parkerrust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ fn findwords(
if totalbits & w != 0 {
0usize
} else {
let idx: usize = bits_to_index[&w];
let mut newwords: [usize; 5] = words.clone();
let idx: usize = bits_to_index[w];
let mut newwords: [usize; 5] = *words;
newwords[numwords] = idx;
findwords(
lettermask,
Expand All @@ -96,40 +96,38 @@ fn findwords(
}
})
.sum::<usize>()
} else {
if numwords == 4 && skipped >= 0 {
let candidate = !(totalbits | lettermask[skipped as usize]) & 0x3FFFFFF;
if let Some(last_index) = bits_to_index.get(&candidate) {
words[numwords] = *last_index;
} else if numwords == 4 && skipped >= 0 {
let candidate = !(totalbits | lettermask[skipped as usize]) & 0x3FFFFFF;
if let Some(last_index) = bits_to_index.get(&candidate) {
words[numwords] = *last_index;

output(index_to_word, words);
numsolutions += 1
output(index_to_word, words);
numsolutions += 1
}
} else {
for w in letter_to_words_bits[i].iter() {
if totalbits & w != 0 {
continue;
}
} else {
for w in letter_to_words_bits[i].iter() {
if totalbits & w != 0 {
continue;
}

let idx: usize = bits_to_index[&w];
words[numwords] = idx;
let idx: usize = bits_to_index[w];
words[numwords] = idx;

if numwords == 4 {
output(index_to_word, words);
numsolutions += 1
} else {
numsolutions += findwords(
lettermask,
letter_to_words_bits,
bits_to_index,
index_to_word,
totalbits | w,
numwords + 1,
words,
i + 1,
skipped,
)
}
if numwords == 4 {
output(index_to_word, words);
numsolutions += 1
} else {
numsolutions += findwords(
lettermask,
letter_to_words_bits,
bits_to_index,
index_to_word,
totalbits | w,
numwords + 1,
words,
i + 1,
skipped,
)
}
}
}
Expand All @@ -143,8 +141,7 @@ fn findwords(
numsolutions
}

fn output(index_to_word: &Vec<&[u8]>, words: &[usize; 5]) -> () {
// return;
fn output(index_to_word: &[&[u8]], words: &[usize; 5]) {
let str = format!(
"{} {} {} {} {}",
unsafe { std::str::from_utf8_unchecked(index_to_word[words[0]]) },
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn readwords<'a>(
let char = *char;
// _technically_ this loop will not work for the last word
// In practice the last word has a duplicate letter so we don't care
if char != '\n' as u8 {
if char != b'\n' {
bits |= 1 << (char as u32 - 'a' as u32);
continue;
}
Expand Down Expand Up @@ -73,7 +73,7 @@ pub fn readwords<'a>(
let mut reverseletterorder: [usize; 26] = [0; 26];

for i in 0..26 {
lettermask[i] = (1 as u32) << freq[i].letter;
lettermask[i] = 1_u32 << freq[i].letter;
reverseletterorder[freq[i].letter as usize] = i;
}

Expand Down