Skip to content

patch for bliss-0.77 compatibility #4

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

patch for bliss-0.77 compatibility #4

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
54 changes: 20 additions & 34 deletions sympol/symmetrygroupconstruction/graphconstructionbliss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,6 @@ using namespace permlib;
static LoggerPtr logger(Logger::getLogger("SymGraphB "));


/// data structure used for the bliss callback
struct BlissData {
unsigned int T;
std::list<Permutation::ptr> generators;
};


/// bliss callback for graph automorphism generators
static
void blisshook(
void* user_param,
unsigned int n,
const unsigned int* aut
)
{
BOOST_ASSERT( user_param != 0 );
BlissData* bliss = reinterpret_cast<BlissData*>(user_param);

BOOST_ASSERT( n % bliss->T == 0 );
Permutation::perm proj(n / bliss->T);
for (unsigned int i = 0; i < proj.size(); ++i) {
proj[i] = aut[i];
BOOST_ASSERT( aut[i] < proj.size() );
}
Permutation::ptr p(new Permutation(proj));
bliss->generators.push_back(p);
}


boost::shared_ptr<sympol::PermutationGroup> GraphConstructionBliss::compute(const MatrixConstruction* matrix) const {
const unsigned int T = static_cast<unsigned int>(std::ceil( log2((double) matrix->k() + 1.0) ));
const unsigned int matrixRows = matrix->dimension();
Expand All @@ -71,14 +42,29 @@ boost::shared_ptr<sympol::PermutationGroup> GraphConstructionBliss::compute(cons
YALLOG_DEBUG(logger, "start graph automorphism search with bliss");

bliss::Stats stats;
BlissData data;
data.T = T;
std::list<Permutation::ptr> generators;

/// bliss callback for graph automorphism generators
auto blisshook = [T, &generators](
unsigned int n,
const unsigned int* aut
)
{
BOOST_ASSERT( n % T == 0 );
Permutation::perm proj(n / T);
for (unsigned int i = 0; i < proj.size(); ++i) {
proj[i] = aut[i];
BOOST_ASSERT( aut[i] < proj.size() );
}
Permutation::ptr p(new Permutation(proj));
generators.push_back(p);
};
/* Prefer splitting partition cells corresponding to nodes with color 0 or 1,
* so that we obtain a group basis beginning with them. */
G.set_splitting_heuristic(bliss::Graph::shs_f);
// disable component recursion as advised by Tommi Junttila from bliss
G.set_component_recursion(false);
G.find_automorphisms(stats, blisshook, &data);
G.find_automorphisms(stats, blisshook);
if (yal::DEBUG <= yal::ReportLevel::get())
stats.print(stdout);
else
Expand All @@ -103,12 +89,12 @@ boost::shared_ptr<sympol::PermutationGroup> GraphConstructionBliss::compute(cons

KnownBSGSConstruction<PERMUTATION, TRANSVERSAL> bsgsSetup(matrixRows);
boost::shared_ptr<PermutationGroup> group(new PermutationGroup(
bsgsSetup.construct(data.generators.begin(), data.generators.end(), baseVars.begin(), baseVars.end())
bsgsSetup.construct(generators.begin(), generators.end(), baseVars.begin(), baseVars.end())
));
#else
SchreierSimsConstruction<PERMUTATION, TRANSVERSAL> bsgsSetup(matrixRows);
boost::shared_ptr<PermutationGroup> group(new PermutationGroup(
bsgsSetup.construct(data.generators.begin(), data.generators.end())
bsgsSetup.construct(generators.begin(), generators.end())
));
#endif

Expand Down