Changeset 9c0b20a in git for kernel/clapsing.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

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

File:

• kernel/clapsing.cc (modified) (2 diffs)

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));