Changeset 5222d2a in git

Timestamp:

Dec 22, 2013, 11:25:06 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

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

Children:

ca326f706fd98143096fe2915a0c449e430c157d

Parents:

88c726094b0406a43f64b51105e892d707306874

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-12-22 23:25:06+01:00

git-committer:

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

Message:

new: ttpReduce

Files:

• Singular/dyn_modules/gfanlib/tropical.cc (modified) (2 diffs)
• dyn_modules/callgfanlib/ppinitialReduction.cc (copied) (copied from dyn_modules/callgfanlib/initialReduction.cc)
• dyn_modules/callgfanlib/ppinitialReduction.h (moved) (moved from dyn_modules/callgfanlib/initialReduction.h)
• dyn_modules/callgfanlib/ttinitialReduction.cc (moved) (moved from dyn_modules/callgfanlib/initialReduction.cc) (6 diffs)
• dyn_modules/callgfanlib/ttinitialReduction.h (added)

Singular/dyn_modules/gfanlib/tropical.cc

@@ -5 +5 @@
 #include <bbcone.h>
 
-#include <initialReduction.h>
+#include <ppinitialReduction.h>
+#include <ttinitialReduction.h>
 
 poly initial(poly p)
@@ -469 +470 @@
   p->iiAddCproc("","reduceInitially3",FALSE,reduceInitially3);
   p->iiAddCproc("","reduceInitially4",FALSE,reduceInitially4);
+  p->iiAddCproc("","ttpReduce",FALSE,pReduce);
 #endif //NDEBUG
   p->iiAddCproc("","reduceInitially",FALSE,reduceInitially);

dyn_modules/callgfanlib/ttinitialReduction.cc

@@ -7 +7 @@
 #include <map>
 #include <set>
+
+#define KEEP_COEFF_SMALL 1
 
 /***
@@ -27 +29 @@
     for (gCache = g; gCache; pIter(gCache))
       if (p_LeadmonomDivisibleBy(gCache,toBeChecked,currRing)) break;
-    if (gCache)
-    {
-      n_Power(p,p_GetExp(toBeChecked,1,currRing)-p_GetExp(gCache,1,currRing),&pPower,currRing->cf);
-      coeff = n_Mult(p_GetCoeff(toBeChecked,currRing),pPower,currRing->cf);
-      p_SetCoeff(gCache,n_Add(p_GetCoeff(gCache,currRing),coeff,currRing->cf),currRing);
-      n_Delete(&pPower,currRing->cf); n_Delete(&coeff,currRing->cf);
-      toBeChecked=p_LmDeleteAndNext(toBeChecked,currRing);
-    }
-    else
+    if (!gCache)
     {
       if (n_DivBy(p_GetCoeff(toBeChecked,currRing),p,currRing->cf))
@@ -61 +55 @@
       else
       {
+#ifdef KEEP_COEFF_SMALL
+        if (n_Greater(p_GetCoeff(toBeChecked,currRing),p,currRing->cf))
+        {
+          coeff = n_IntDiv(p_GetCoeff(toBeChecked,currRing),p,currRing->cf);
+          p_SetCoeff(toBeChecked,
+                     n_IntMod(p_GetCoeff(toBeChecked,currRing),p,currRing->cf),
+                     currRing);
+          subst = p_LmInit(toBeChecked,currRing);
+          p_AddExp(subst,1,1,currRing);
+          p_SetCoeff(subst,coeff,currRing);
+          p_Setm(subst,currRing); pTest(subst);
+          pNext(toBeChecked)=p_Add_q(pNext(toBeChecked),subst,currRing);
+          pTest(toBeChecked);
+        }
+#endif
         pNext(gEnd)=toBeChecked;
         pIter(gEnd); pIter(toBeChecked);
@@ -72 +81 @@
 
 #ifndef NDEBUG
-BOOLEAN pReduce(leftv res, leftv args)
+BOOLEAN ttpReduce(leftv res, leftv args)
 {
   leftv u = args;
@@ -97 +106 @@
 
 
+#if 0
 /***
  * reduces h initially with respect to g,
@@ -598 +608 @@
   return TRUE;
 }
+
+#endif