Skip to content

Add Hadamard bound include and update determinant function #331

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

Add Hadamard bound include and update determinant function #331

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
26 changes: 26 additions & 0 deletions linbox/solutions/det.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "linbox/blackbox/compose.h"
#include "linbox/solutions/methods.h"
#include "linbox/solutions/getentry.h"
#include "linbox/solutions/hadamard-bound.h"
#include "linbox/vector/blas-vector.h"

#include "linbox/matrix/dense-matrix.h"
Expand All @@ -47,6 +48,8 @@
#include "linbox/util/debug.h"
#include "linbox/util/mpicpp.h"

#include <cmath>


// Namespace in which all LinBox library code resides
namespace LinBox
Expand Down Expand Up @@ -607,6 +610,29 @@ namespace LinBox
namespace LinBox
{

template <class Rep, class MyMethod>
Integer &det (Integer &d,
const BlasMatrix<Givaro::ZRing<Integer>, Rep> &A,
const RingCategories::IntegerTag &,
const MyMethod &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");

if (A.coldim() == 0)
return d = 1;

size_t det_bound_bits = static_cast<size_t>(std::ceil(HadamardBound(A) + 1.0));

typedef Givaro::ModularBalanced<double> Field;
IntegerModularDet<BlasMatrix<Givaro::ZRing<Integer>, Rep>, MyMethod> iteration(A, Meth);
PrimeIterator<IteratorCategories::HeuristicTag> genprime(FieldTraits<Field>::bestBitSize(A.coldim()));
ChineseRemainder< CRABuilderFullSingle< Field > > cra(det_bound_bits);
cra(d, iteration, genprime);

return d;
}

template <class Blackbox, class MyMethod>
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
Expand Down