Changeset 9c0b20a in git

Timestamp:

Nov 25, 2010, 4:11:10 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

488872b51cd1fa36918b12c9c2476c1edff62026

Parents:

c512d93f75cc91a718679d4a03b14439936966e2

Message:

LLL via system("LLL",M) for matrix (char 0)/intmat


git-svn-id: file:///usr/local/Singular/svn/trunk@13670 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/extra.cc (modified) (1 diff)
• factory/cf_hnf.cc (modified) (2 diffs)
• factory/cf_hnf.h (modified) (1 diff)
• kernel/clapsing.cc (modified) (2 diffs)
• kernel/clapsing.h (modified) (1 diff)

Singular/extra.cc

@@ -3451 +3451 @@
       }
       else
+      if (strcmp(sys_cmd, "LLL") == 0)
+      {
+        if (h!=NULL)
+        {
+          res->rtyp=h->Typ();
+          if (h->Typ()==MATRIX_CMD)
+          {
+            res->data=(char *)singntl_LLL((matrix)h->Data());
+            return FALSE;
+          }
+          else if (h->Typ()==INTMAT_CMD)
+          {
+            res->data=(char *)singntl_LLL((intvec*)h->Data());
+            return FALSE;
+          }
+          else return TRUE;
+        }
+        else return TRUE;
+      }
+      else
   /*================= factoras =========================*/
       if (strcmp (sys_cmd, "factoras") == 0)

factory/cf_hnf.cc

@@ -19 +19 @@
 #include <NTL/mat_ZZ.h>
 #include <NTL/HNF.h>
+#include <NTL/LLL.h>
 
 // The input matrix A is an n x m matrix of rank m (so n >= m), and D
@@ -40 +41 @@
   return convertNTLmat_ZZ2FacCFMatrix(WW);
 }
+CFMatrix* cf_LLL(CFMatrix& A)
+{
+  mat_ZZ *AA=convertFacCFMatrix2NTLmat_ZZ(A);
+  LLL_RR(*AA);
+  delete AA;
+  CFMatrix *r= convertNTLmat_ZZ2FacCFMatrix(*AA);
+  delete AA;
+  return r;
+}
 #endif

factory/cf_hnf.h

@@ -24 +24 @@
 CFMatrix* cf_HNF(CFMatrix& A);
 
+// performs LLL reduction.
+
+// B is an m x n matrix, viewed as m rows of n-vectors.  m may be less
+// than, equal to, or greater than n, and the rows need not be
+// linearly independent.  B is transformed into an LLL-reduced basis,
+// and the return value is the rank r of B.  The first m-r rows of B
+// are zero.  
+
+// More specifically, elementary row transformations are performed on
+// B so that the non-zero rows of new-B form an LLL-reduced basis
+// for the lattice spanned by the rows of old-B.
+// The default reduction parameter is delta=3/4, which means
+// that the squared length of the first non-zero basis vector
+// is no more than 2^{r-1} times that of the shortest vector in
+// the lattice.
+
+CFMatrix* cf_LLL(CFMatrix& A);
+
 /*ENDPUBLIC*/
 

kernel/clapsing.cc

@@ -1577 +1577 @@
       }
     }
-    for(i=r;i>0;i--)
-    {
-      for(j=r;j>0;j--)
-      {
-        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
-      }
-    }
     CFMatrix *MM=cf_HNF(M);
     for(i=r;i>0;i--)
@@ -1619 +1612 @@
   {
     for(j=r;j>0;j--)
+    {
+      IMATELEM(*mm,i,j)=convFactoryISingI((*MM)(i,j));
+    }
+  }
+  delete MM;
+  return mm;
+}
+matrix singntl_LLL(matrix  m )
+{  
+  int r=m->rows();
+  int c=m->cols();
+  matrix res=mpNew(r,c);
+  if (rField_is_Q(currRing))
+  {
+    CFMatrix M(r,c);
+    int i,j;
+    for(i=r;i>0;i--)
+    {
+      for(j=c;j>0;j--)
+      {
+        M(i,j)=convSingPFactoryP(MATELEM(m,i,j));
+      }
+    }
+    CFMatrix *MM=cf_LLL(M);
+    for(i=r;i>0;i--)
+    {
+      for(j=c;j>0;j--)
+      {  
+        MATELEM(res,i,j)=convFactoryPSingP((*MM)(i,j));
+      }
+    }
+    delete MM;
+  }
+  return res;
+}
+intvec* singntl_LLL(intvec*  m )
+{
+  int r=m->rows();
+  int c=m->cols();
+  setCharacteristic( 0 );
+  CFMatrix M(r,c);
+  int i,j;
+  for(i=r;i>0;i--)
+  {
+    for(j=r;j>0;j--)
+    {
+      M(i,j)=IMATELEM(*m,i,j);
+    }
+  }
+  CFMatrix *MM=cf_LLL(M);
+  intvec *mm=ivCopy(m);
+  for(i=r;i>0;i--)
+  {
+    for(j=c;j>0;j--)
     {
       IMATELEM(*mm,i,j)=convFactoryISingI((*MM)(i,j));

kernel/clapsing.h

@@ -42 +42 @@
 matrix singntl_HNF(matrix A);
 intvec* singntl_HNF(intvec* A);
+matrix singntl_LLL(matrix A);
+intvec* singntl_LLL(intvec* A);
 
 BOOLEAN singclap_isSqrFree(poly f);