Changeset 24a9587 in git

Timestamp:

Jun 27, 2012, 1:45:03 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

cffd3e2f630fbc7b0e35afee97d6fa948cfd0b3e

Parents:

aaf761115c8487a0b7cf9172e2957b9899725c93

Message:

add: det for bigintmat

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (3 diffs)
• libpolys/polys/clapsing.h (modified) (3 diffs)

Singular/iparith.cc

@@ -3839 +3839 @@
     p=singclap_det(m,currRing);
   res ->data = (char *)p;
+  return FALSE;
+}
+static BOOLEAN jjDET_BI(leftv res, leftv v)
+{
+  bigintmat * m=(bigintmat*)v->Data();
+  int i,j;
+  i=m->rows();j=m->cols();
+  if(i==j)
+    res->data = (char *)(long)singclap_det_bi(m,coeffs_BIGINT);
+  else
+  {
+    Werror("det of %d x %d bigintmat",i,j);
+    return TRUE;
+  }
   return FALSE;
 }

Singular/table.h

@@ -84 +84 @@
 ,{D(jjNUMERATOR),  NUMERATOR_CMD,   NUMBER_CMD,     NUMBER_CMD    , ALLOW_PLURAL |ALLOW_RING}
 #ifdef HAVE_FACTORY
+,{D(jjDET_BI),     DET_CMD,         BIGINT_CMD,     BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjDET_I),      DET_CMD,         INT_CMD,        INTMAT_CMD    , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjDET),        DET_CMD,         POLY_CMD,       MATRIX_CMD    , NO_PLURAL |ALLOW_RING}

libpolys/polys/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id$
 /*
 * ABSTRACT: interface between Singular and factory
@@ -25 +24 @@
 #include <coeffs/numbers.h>
 #include <coeffs/coeffs.h>
+#include <coeffs/bigintmat.h>
 
 // #include <kernel/ffields.h>
@@ -1430 +1430 @@
   }
   int res= convFactoryISingI( determinant(M,m->rows()) ) ;
-  Off(SW_RATIONAL); // ?
+  return res;
+}
+
+number singclap_det_bi( bigintmat * m, const coeffs cf)
+{
+  assume(m->basecoeffs()==cf);
+  CFMatrix M(m->rows(),m->cols());
+  int i,j;
+  BOOLEAN setchar=TRUE;
+  for(i=m->rows();i>0;i--)
+  {
+    for(j=m->cols();j>0;j--)
+    {
+      M(i,j)=cf->convSingNFactoryN(BIMATELEM(*m,i,j),setchar,cf);
+      setchar=FALSE;
+    }
+  }
+  number res= cf->convFactoryNSingN( determinant(M,m->rows()),cf ) ;
   return res;
 }

libpolys/polys/clapsing.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id$
 /*
 * ABSTRACT: interface between Singular and factory
@@ -20 +19 @@
 #include <misc/intvec.h>
 #include <polys/matpol.h>
+#include <coeffs/bigintmat.h>
 //#include <polys/clapconv.h>
 //#include <kernel/longtrans.h>
@@ -62 +62 @@
 poly singclap_det( const matrix m, const ring r );
 int singclap_det_i( intvec * m, const ring r );
+number singclap_det_bi( bigintmat * m, const coeffs cf);
 
 number   nChineseRemainder(number *x, number *q,int rl, const coeffs r);