Changeset 3ef9c8 in git

Timestamp:

Dec 10, 2011, 12:51:17 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f41d12e69588befe7fc3383e41747d4ac6575de4f78374aba946095faa511cce5808e17088898c1a

Parents:

600d9a415e87303ccbc4a8f4460e9617a66c7f81

git-author:

Martin Lee <martinlee84@web.de>2011-12-10 00:51:17+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 21:04:28+01:00

Message:

chg: changes in factory interface and iparith.cc accordingly to master

Files:

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

Singular/iparith.cc

@@ -3154 +3154 @@
   if ((sw<0)||(sw>2)) fac_sw=1;
   singclap_factorize_retry=0;
-  ideal f=singclap_sqrfree((poly)(u->CopyD()), &v, fac_sw);
+  ideal f=singclap_sqrfree((poly)(u->CopyD()), &v, fac_sw, currRing);
   if (f==NULL)
     return TRUE;
@@ -4682 +4682 @@
 {
   singclap_factorize_retry=0;
+  intvec *v=NULL;
   ideal f=singclap_sqrfree((poly)(u->CopyD()), &v, 0, currRing);
   if (f==NULL) return TRUE;

libpolys/polys/clapsing.cc

@@ -952 +952 @@
   return res;
 }
-ideal singclap_sqrfree ( poly f, const ring r)
+ideal singclap_sqrfree ( poly f, intvec ** v , int with_exps, const ring r)
 {
   p_Test(f,r);
@@ -969 +969 @@
   {
     res=idInit(1,1);
+    if (with_exps!=1)
+    {
+      (*v)=new intvec(1);
+      (**v)[0]=1;
+    }
     return res;
   }
@@ -978 +983 @@
     int e;
     for(i=rVar(r);i>0;i--) if(p_GetExp(f,i,r)!=0) n++;
-    n++; // with coeff
+    if (with_exps==0) n++; // with coeff
     res=idInit(si_max(n,1),1);
+    switch(with_exps)
+    {
+      case 0: // with coef & exp.
+        res->m[0]=p_NSet(n_Copy(pGetCoeff(f),r->cf),r);
+        // no break
+      case 2: // with exp.
+        (*v)=new intvec(si_max(1,n));
+        (**v)[0]=1;
+        // no break
+      case 1: ;
+      #ifdef TEST
+      default: ;
+      #endif
+    }
     res->m[0]=p_NSet(n_Copy(pGetCoeff(f),r->cf),r);
     if (n==0)
@@ -985 +1004 @@
       res->m[0]=p_One(r);
       // (**v)[0]=1; is already done
-      return res;
-    }
-    for(i=rVar(r);i>0;i--)
-    {
-      e=p_GetExp(f,i,r);
-      if(e!=0)
-      {
-        n--;
-        poly p=p_One(r);
-        p_SetExp(p,i,1,r);
-        p_Setm(p,r);
-        res->m[n]=p;
-      }
-    }
+    }
+    else
+    {
+      for(i=rVar(r);i>0;i--)
+      {
+        e=p_GetExp(f,i,r);
+        if(e!=0)
+        {
+          n--;
+          poly p=p_One(r);
+          p_SetExp(p,i,1,r);
+          p_Setm(p,r);
+          res->m[n]=p;
+          if (with_exps!=1) (**v)[n]=e;
+        }
+      }
+    }
+    p_Delete(&f,r);
     return res;
   }
@@ -1010 +1033 @@
   #endif
   CFFList L;
+  number N=NULL;
+  number NN=NULL;
 
   if (!rField_is_Zp(r) && !rField_is_Zp_a(r)) /* Q, Q(a) */
   {
     //if (f!=NULL) // already tested at start of routine
-    {
-      p_Cleardenom(f, r);
+    number n0=n_Copy(pGetCoeff(f),r->cf);
+    if (with_exps==0)
+      N=n_Copy(n0,r->cf);
+    p_Cleardenom(f, r);
+    //after here f should not have a denominator!!
+    //PrintS("S:");p_Write(f,r);PrintLn();
+    NN=n_Div(n0,pGetCoeff(f),r->cf);
+    n_Delete(&n0,r->cf);
+    if (with_exps==0)
+    {
+      n_Delete(&N,r->cf);
+      N=n_Copy(NN,r->cf);
     }
   }
@@ -1023 +1058 @@
     if (singclap_factorize_retry==0)
     {
+      number n0=n_Copy(pGetCoeff(f),r->cf);
+      if (with_exps==0)
+        N=n_Copy(n0,r->cf);
       p_Norm(f,r);
       p_Cleardenom(f, r);
+      NN=n_Div(n0,pGetCoeff(f),r->cf);
+      n_Delete(&n0,r->cf);
+      if (with_exps==0)
+      {
+        n_Delete(&N,r->cf);
+        N=n_Copy(NN,r->cf);
+      }
     }
   }
@@ -1032 +1077 @@
     CanonicalForm F( convSingPFactoryP( f,r ) );
     L = sqrFree( F );
+  }
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a (r)) setCharacteristic (0);
+    else                   setCharacteristic( rChar(r) );
+    if (r->cf->extRing->minideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+                                           r->cf->extRing);
+      Variable a=rootOf(mipo);
+      CanonicalForm F( convSingAPFactoryAP( f, a, r ) );
+      L= sqrFree (F);
+    }
+    else
+    {
+      CanonicalForm F( convSingTrPFactoryP( f,r ) );
+      L = sqrFree( F );
+    }
   }
   #if 0
@@ -1059 +1122 @@
     CFFListIterator J=L;
     int j=0;
+    if (with_exps!=1)
+    {
+      if ((with_exps==2)&&(n>1))
+      {
+        n--;
+        J++;
+      }
+      *v = new intvec( n );
+    }
+    else if (L.getFirst().factor().inCoeffDomain())
+    {
+      n--;
+      J++;
+    }
     res = idInit( n ,1);
     for ( ; J.hasItem(); J++, j++ )
     {
-      res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
+      if (with_exps!=1) (**v)[j] = J.getItem().exp();
+      if (rField_is_Zp(r) || rField_is_Q(r))
+        res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
+      else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
+      {
+        if (r->cf->extRing->minideal==NULL)
+          res->m[j]=convFactoryPSingTrP( J.getItem().factor(),r );
+        else
+          res->m[j]=convFactoryAPSingAP( J.getItem().factor(),r );
+      }
     }
     if (res->m[0]==NULL)

libpolys/polys/clapsing.h

@@ -39 +39 @@
 ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r);
 
-ideal singclap_sqrfree ( poly f, const ring r );
+ideal singclap_sqrfree ( poly f, intvec ** v , int with_exps, const ring r );
 
 #ifdef HAVE_NTL