Changeset 899d4c in git for factory/NTLconvert.cc

Timestamp:

May 21, 2010, 5:50:29 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

24794e7b9df4f3be9431292795117f890eef2558

Parents:

76d3d6fb320d88ec7de6603328f5f6c6fe2caa07

Message:

NTL::mat_ZZ

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

File:

• factory/NTLconvert.cc (modified) (4 diffs)

factory/NTLconvert.cc

@@ -37 +37 @@
 #include <NTL/GF2EXFactoring.h>
 #include <NTL/tools.h>
+#include <NTL/mat_ZZ.h>
 #include "int_int.h"
 #include <limits.h>
@@ -655 +656 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+ZZ convertFacCF2NTLZZ(const CanonicalForm f)
+{
+  ZZ temp;
+  if (f.isImm()) temp=f.intval();
+  else
+  {
+    //Coefficient is a gmp-number
+    mpz_t gmp_val;
+    char* stringtemp;
+
+    gmp_val[0]=getmpi(f.getval());
+    int l=mpz_sizeinbase(gmp_val,10)+2;
+    stringtemp=(char*)Alloc(l);
+    stringtemp=mpz_get_str(stringtemp,10,gmp_val);
+    mpz_clear(gmp_val);
+    conv(temp,stringtemp);
+    Free(stringtemp,l);
+  }
+  return temp;
+}
+
 ZZX convertFacCF2NTLZZX(CanonicalForm f)
 {
@@ -678 +700 @@
       NTLcurrentExp=i.exp();
 
-      if (!i.coeff().isImm())
-      {
-        //Coefficient is a gmp-number
-        mpz_t gmp_val;
-        ZZ temp;
-        char* stringtemp;
-
-        gmp_val[0]=getmpi(i.coeff().getval());
-        int l=mpz_sizeinbase(gmp_val,10)+2;
-        stringtemp=(char*)Alloc(l);
-        stringtemp=mpz_get_str(stringtemp,10,gmp_val);
-        mpz_clear(gmp_val);
-        conv(temp,stringtemp);
-        Free(stringtemp,l);
-
-        //set the computed coefficient
-        SetCoeff(ntl_poly,NTLcurrentExp,temp);
-      }
-      else
-      {
-        //Coefficient is immediate --> use its value
-        SetCoeff(ntl_poly,NTLcurrentExp,i.coeff().intval());
-      }
+      //Coefficient is a gmp-number
+      ZZ temp=convertFacCF2NTLZZ(i.coeff());
+
+      //set the computed coefficient
+      SetCoeff(ntl_poly,NTLcurrentExp,temp);
 
       NTLcurrentExp--;
@@ -1088 +1092 @@
   }
 }
+//----------------------------------------------------------------------
+mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(CFMatrix &m)
+{
+  mat_ZZ *res=new mat_ZZ;
+  res->SetDims(m.rows(),m.columns());
+
+  int i,j;
+  for(i=m.rows();i>0;i--)
+  {
+    for(j=m.columns();j>0;j--)
+    {
+      (*res)(i,j)=convertFacCF2NTLZZ(m(i,j));
+    }
+  }
+  return res;
+}
+CFMatrix* convertNTLmat_ZZ2FacCFMatrix(mat_ZZ &m)
+{
+  CFMatrix *res=new CFMatrix(m.NumRows(),m.NumCols());
+  int i,j;
+  for(i=res->rows();i>0;i--)
+  {
+    for(j=res->columns();j>0;j--)
+    {
+      (*res)(i,j)=convertZZ2CF(m(i,j));
+    }
+  }
+  return res;
+}
+
 #endif