Changeset 528fa78 in git

Timestamp:

Dec 2, 2013, 2:40:16 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

edb60f7c79d1b2f53a09d2650752f01a8d8da321

Parents:

7a4e77045299daf5ac74ab3774c5e1b784ff4e94

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-12-02 14:40:16+01:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:02+01:00

Message:

new: reduceInitially(ideal I, const number p)

File:

• dyn_modules/callgfanlib/initialReduction.cc (modified) (4 diffs)

dyn_modules/callgfanlib/initialReduction.cc

@@ -112 +112 @@
 /***
  * reduces h initially with respect to g,
- * returns NULL if h was initially reduced in the first place. if reductions have taken place,
- * returns a pointer to a term from which onwards changes have taken place.
+ * returns false if h was initially reduced in the first place,
+ * returns true if reductions have taken place.
  * assumes that h and g are in pReduced form and homogeneous in x of the same degree
  **/
-poly reduceInitially(poly &h, const poly g)
-{
-  poly hCache=h;
-  if (p_LeadmonomDivisibleBy(g,hCache,currRing))
+bool reduceInitially(poly &h, const poly g)
+{
+  poly hCache;
+  for (hCache=h; hCache; pIter(hCache))
+    if (p_LeadmonomDivisibleBy(g,hCache,currRing)) break;
+  if (hCache)
   {
     number gAlpha = p_GetCoeff(g,currRing);
@@ -132 +134 @@
                 currRing);
     pTest(h);
-    return(h);
-  }
-  for (; pNext(hCache); pIter(hCache))
-    if (p_LeadmonomDivisibleBy(g,pNext(hCache),currRing)) break;
-  if (pNext(hCache))
-  {
-    number gAlpha = p_GetCoeff(g,currRing);
-    poly hAlphaT = p_Init(currRing);
-    p_SetCoeff(hAlphaT,n_Copy(p_GetCoeff(pNext(hCache),currRing),currRing->cf),currRing);
-    p_SetExp(hAlphaT,1,p_GetExp(pNext(hCache),1,currRing)-p_GetExp(g,1,currRing),currRing);
-    for (int i=2; i<=currRing->N; i++)
-      p_SetExp(hAlphaT,i,0,currRing);
-    p_Setm(hAlphaT,currRing); pTest(hAlphaT);
-    h = p_Add_q(p_Mult_nn(h,gAlpha,currRing),
-                p_Neg(p_Mult_q(p_Copy(g,currRing),hAlphaT,currRing),currRing),
-                currRing);
-    pTest(h);
-  }
-  return pNext(hCache);
+    return true;
+  }
+  return false;
 }
 
@@ -221 +207 @@
    * the first pass. removing terms with the same monomials in x as lt(g_i) out of g_j for i<j
    **/
-  poly cache = NULL;
   for (i=0; i<IDELEMS(I)-1; i++)
-  {
     for (j=i+1; j<IDELEMS(I); j++)
-    {
-      cache = reduceInitially(I->m[j], I->m[i]);
-      if (cache)
-      {
-        if(pReduce(cache,p)) return true;
-        cache = NULL;
-      }
-    }
-  }
+      if (reduceInitially(I->m[j], I->m[i]) && pReduce(I->m[j],p)) return true;
 
   /***
@@ -239 +215 @@
    **/
   for (i=0; i<IDELEMS(I)-1; i++)
-  {
     for (j=i+1; j<IDELEMS(I); j++)
-    {
-      cache = reduceInitially(I->m[i], I->m[j]);
-      if (cache)
-      {
-        if (pReduce(cache,p)) return true;
-        cache = NULL;
-      }
-    }
-  }
+      if (reduceInitially(I->m[i], I->m[j]) && pReduce(I->m[i],p)) return true;
   return false;
 }