Changeset f3f0ad in git

Timestamp:

Mar 18, 2015, 12:25:24 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

efb09679f464982644f48e648b0d4a8c20f4f5ca

Parents:

45d2e45fd4ec2a9209f724d4ccfaff36d3f61c92

Message:

add rHasMixedOrdering

Files:

• doc/reference.doc (modified) (previous)
• kernel/GBEngine/kutil.cc (modified) (9 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (6 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/GBEngine/kutil.cc

@@ -426 +426 @@
 
   strat->kHEdgeFound=FALSE;
-  if (currRing->pLexOrder || currRing->MixedOrder)
+  if (currRing->pLexOrder || rHasMixedOrdering(currRing))
   {
     return;
@@ -3868 +3868 @@
   int en = length;
   int cmp_int = currRing->OrdSgn;
-  if ((currRing->MixedOrder)
+  if ((rHasMixedOrdering(currRing))
 #ifdef HAVE_PLURAL
   && (currRing->real_var_start==0)
@@ -7308 +7308 @@
 
   //if the ordering is local, then hilb criterion
-  //can be used also if tzhe ideal is not homogenous
-  if((rHasLocalOrMixedOrdering(currRing)) && (currRing->MixedOrder == 0 ))
+  //can be used also if the ideal is not homogenous
+  if((rHasLocalOrMixedOrdering(currRing)) && (rHasMixedOrdering(currRing)==FALSE))
   #ifdef HAVE_RINGS
   {
@@ -7351 +7351 @@
   * - in local rings, - in lex order case, -in ring over extensions */
   strat->noTailReduction = !TEST_OPT_REDTAIL;
+  //if(rHasMixedOrdering(currRing)==2)
+  //{
+  // strat->noTailReduction =TRUE;
+  //}
 
 #ifdef HAVE_PLURAL
@@ -7423 +7427 @@
   * - in local rings, - in lex order case, -in ring over extensions */
   strat->noTailReduction = !TEST_OPT_REDTAIL;
-  //strat->noTailReduction = NULL;
+  if(rHasMixedOrdering(currRing)) strat->noTailReduction =TRUE;
 
 #ifdef HAVE_PLURAL
@@ -7623 +7627 @@
   }
   strat->fromT = FALSE;
-  strat->noTailReduction = !TEST_OPT_REDTAIL;
   if ((!TEST_OPT_SB_1)
   #ifdef HAVE_RINGS
@@ -7817 +7820 @@
   }
   strat->fromT = FALSE;
-  strat->noTailReduction = !TEST_OPT_REDTAIL;
   if (!TEST_OPT_SB_1)
   {
@@ -8003 +8005 @@
 
   strat->noTailReduction = FALSE;
+  //if(rHasMixedOrdering(currRing)) strat->noTailReduction = TRUE;
   if (TEST_OPT_PROT)
   {
@@ -9113 +9116 @@
   }
   strat->fromT = FALSE;
-  strat->noTailReduction = !TEST_OPT_REDTAIL;
   if (!TEST_OPT_SB_1)
   {

libpolys/polys/ext_fields/transext.cc

@@ -1322 +1322 @@
   /* here we assume: NUM(f), DEN(f) !=NULL, in Z_a reqp. Z/p_a */
   poly pGcd = singclap_gcd_and_divide(NUM(f), DEN(f), ntRing);
+  //PrintS("gcd= ");p_wrp(pGcd,ntRing);PrintLn();
   if (p_IsConstant(pGcd, ntRing)
   && n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs)
@@ -1457 +1458 @@
   if ( /*(*/ a!=NULL /*)*/ )
   {
+    //PrintS("num=");p_wrp(NUM(a),ntRing);
+    //PrintS(" den=");p_wrp(DEN(a),ntRing);PrintLn();
     definiteGcdCancellation(a, cf, FALSE);
     if ((DEN(a)!=NULL)

libpolys/polys/monomials/ring.cc

@@ -1318 +1318 @@
   res->CanShortOut=r->CanShortOut;
   res->LexOrder=r->LexOrder; // TRUE if the monomial ordering has polynomial and power series blocks
-  res->MixedOrder=r->MixedOrder; // ?? 1 for lex ordering (except ls), -1 otherwise
+  res->MixedOrder=r->MixedOrder; // TRUE for mixed (global/local) ordering, FALSE otherwise,
+  // 2 for diffenerent signs within one block
   res->ComponentOrder=r->ComponentOrder;
 
@@ -1460 +1461 @@
   res->CanShortOut=r->CanShortOut;
   res->LexOrder=r->LexOrder; // TRUE if the monomial ordering has polynomial and power series blocks
-  res->MixedOrder=r->MixedOrder; // ?? 1 for lex ordering (except ls), -1 otherwise
+  res->MixedOrder=r->MixedOrder; // TRUE for mixed (global/local) ordering, FALSE otherwise,
+  // 2 for diffenerent signs within one block
   res->ComponentOrder=r->ComponentOrder;
 
@@ -3015 +3017 @@
         int i;
         for(i=r->block1[o]-r->block0[o];i>=0;i--)
-          if (r->wvhdl[o][i]<0) { r->MixedOrder=TRUE; break; }
+          if (r->wvhdl[o][i]<0) { r->MixedOrder=2; break; }
       }
       break;
@@ -3023 +3025 @@
     case ringorder_C:
     case ringorder_S:
-      r->ComponentOrder=-1;
+      r->ComponentOrder=TRUE;
       break;
     case ringorder_M:
@@ -3130 +3132 @@
     r->MixedOrder = FALSE;
     for(int ii=block0[0];ii<=block1[0];ii++)
-      if (wvhdl[0][ii-1]<0) { r->MixedOrder=TRUE;break;}
+      if (wvhdl[0][ii-1]<0) { r->MixedOrder=2;break;}
     r->LexOrder=FALSE;
     for(int ii=block0[0];ii<=block1[0];ii++)
@@ -5628 +5630 @@
   return 0;
 }
-

libpolys/polys/monomials/ring.h

@@ -741 +741 @@
 inline BOOLEAN rHasGlobalOrdering(const ring r){ return (r->OrdSgn==1); }
 inline BOOLEAN rHasLocalOrMixedOrdering(const ring r){ return (r->OrdSgn==-1); }
+inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder==1); }
 
 // #define rHasGlobalOrdering(R) ((R)->OrdSgn==1)