Changeset c92097b in git

Timestamp:

Jan 4, 2012, 7:48:21 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4d0cbc73d042b4eff26b590ee72477709df171a3

Parents:

0fc4c8bd0177d4673beebe5a386cd69e4161f080

git-author:

Martin Lee <martinlee84@web.de>2012-01-04 19:48:21+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-01-05 12:26:44+01:00

Message:

chg: changed behaviour of sqrfree with optional argument 3

(according to master)

Files:

• Singular/iparith.cc (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• libpolys/polys/clapsing.cc (modified) (9 diffs)

Singular/iparith.cc

@@ -3152 +3152 @@
   int sw=(int)(long)dummy->Data();
   int fac_sw=sw;
-  if ((sw<0)||(sw>2)) fac_sw=1;
+  if (sw<0) fac_sw=1;
   singclap_factorize_retry=0;
   ideal f=singclap_sqrfree((poly)(u->CopyD()), &v, fac_sw, currRing);

libpolys/polys/clapsing.cc

@@ -969 +969 @@
   {
     res=idInit(1,1);
-    if (with_exps!=1)
+    if (with_exps!=1 && with_exps!=3)
     {
       (*v)=new intvec(1);
@@ -983 +983 @@
     int e;
     for(i=rVar(r);i>0;i--) if(p_GetExp(f,i,r)!=0) n++;
-    if (with_exps==0) n++; // with coeff
+    if (with_exps==0 || with_exps==3) 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 3: // with coef & exp.
         res->m[0]=p_NSet(n_Copy(pGetCoeff(f),r->cf),r);
         // no break
@@ -1041 +1044 @@
     //if (f!=NULL) // already tested at start of routine
     number n0=n_Copy(pGetCoeff(f),r->cf);
-    if (with_exps==0)
+    if (with_exps==0 || with_exps==3)
       N=n_Copy(n0,r->cf);
     p_Cleardenom(f, r);
@@ -1048 +1051 @@
     NN=n_Div(n0,pGetCoeff(f),r->cf);
     n_Delete(&n0,r->cf);
-    if (with_exps==0)
+    if (with_exps==0 || with_exps==3)
     {
       n_Delete(&N,r->cf);
@@ -1060 +1063 @@
     {
       number n0=n_Copy(pGetCoeff(f),r->cf);
-      if (with_exps==0)
+      if (with_exps==0 || with_exps==3)
         N=n_Copy(n0,r->cf);
       p_Norm(f,r);
@@ -1066 +1069 @@
       NN=n_Div(n0,pGetCoeff(f),r->cf);
       n_Delete(&n0,r->cf);
-      if (with_exps==0)
+      if (with_exps==0 || with_exps==3)
       {
         n_Delete(&N,r->cf);
@@ -1132 +1135 @@
       *v = new intvec( n );
     }
-    else if (L.getFirst().factor().inCoeffDomain())
+    else if (L.getFirst().factor().inCoeffDomain() && with_exps!=3)
     {
       n--;
@@ -1140 +1143 @@
     for ( ; J.hasItem(); J++, j++ )
     {
-      if (with_exps!=1) (**v)[j] = J.getItem().exp();
+      if (with_exps!=1 && with_exps!=3) (**v)[j] = J.getItem().exp();
       if (rField_is_Zp(r) || rField_is_Q(r))
         res->m[j] = convFactoryPSingP( J.getItem().factor(),r );
@@ -1166 +1169 @@
     int i=IDELEMS(res)-1;
     int stop=1;
-    if (with_exps!=0) stop=0;
+    if (with_exps!=0 || with_exps==3) stop=0;
     for(;i>=stop;i--)
     {
       p_Norm(res->m[i],r);
     }
-    if (with_exps==0) p_SetCoeff(res->m[0],old_lead_coeff,r);
+    if (with_exps==0 || with_exps==3) p_SetCoeff(res->m[0],old_lead_coeff,r);
     else n_Delete(&old_lead_coeff,r->cf);
   }