Skip to content

Shurikens: Make the solution checker aware of equivalent solutions #43

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
emanuelmch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Shurikens: Make the solution checker aware of equivalent solutions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions core/src/common/arbitrary_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ struct ArbitraryContainer {

return result;
}
// TODO: inline value_t &operator[](size_t i) { ... }
inline value_t operator[](size_t i) const { return at(i); }
inline size_t size() const { return internal.size() / valueBitLength; }

Expand Down
32 changes: 29 additions & 3 deletions core/src/shurikens/data/data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,43 @@ namespace Shurikens {
struct ShurikenData {

ShurikenData(std::string name, Shuriken shuriken, const Shurikens::MoveContainer &solution)
: name(std::move(name)), shuriken(std::move(shuriken)), solutions({solution}) {}
: name(std::move(name)), shuriken(std::move(shuriken)), solutions({solution}) {
}

ShurikenData(std::string name, Shuriken shuriken, const Shurikens::MoveContainer &solution0,
const Shurikens::MoveContainer &solution1)
: name(std::move(name)), shuriken(std::move(shuriken)), solutions({solution0, solution1}) {
: name(std::move(name)), shuriken(std::move(shuriken)), solutions({solution0, solution1}) {
assert(solution0.size() == solution1.size());
}

inline size_t solutionSize() const { return solutions.cbegin()->size(); }

inline bool isSolution(const Shurikens::MoveContainer &solution) const {
return solutions.find(solution) != solutions.end();
if (solution.size() != solutions.cbegin()->size()) return false;

const bool isExactSolution = solutions.find(solution) != solutions.end();
if (isExactSolution) return true;

const auto &lastMove = solution.at(solution.size() - 1);
// If the last move is a swap, it doesn't matter if it's top or bottom
if (lastMove == swap_top) {
// TODO: This for loop should've been `MoveContainer copy{solution.cbegin(), solution.cend() - 1};` instead
MoveContainer copy;
for (size_t i = 0; i < solution.size() - 1; ++i) {
copy.push(solution[i]);
}
copy.push(swap_bottom);
return solutions.find(copy) != solutions.end();
} else if (lastMove == swap_bottom) {
MoveContainer copy;
for (size_t i = 0; i < solution.size() - 1; ++i) {
copy.push(solution[i]);
}
copy.push(swap_top);
return solutions.find(copy) != solutions.end();
}

return false;
}

const std::string name;
Expand Down