Changeset 526e40d in git

Timestamp:

Apr 11, 2011, 3:22:53 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

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

Children:

16733868763266ec04dae72db238bced32663735

Parents:

e1375d3317dc56c03a4c242a459ec4e46e17f1cd

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-04-11 13:22:53+00:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-11 13:22:53+00:00

Message:

collect denominators of std computations in denom_list
call system("denom_list");

From: Mohamed Barakat <mohamed.barakat@rwth-aachen.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@14135 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/Makefile.in (modified) (1 diff)
• Singular/denom_list.cc (added)
• Singular/extra.cc (modified) (1 diff)
• kernel/kInline.cc (modified) (2 diffs)
• kernel/kutil.cc (modified) (4 diffs)
• kernel/kutil.h (modified) (1 diff)
• kernel/polys1.cc (modified) (5 diffs)

Singular/Makefile.in

@@ -221 +221 @@
     MinorInterface.cc \
     bigintm.cc pyobject_setup.cc \
-    bbcone.cc bbfan.cc
+    bbcone.cc bbfan.cc denom_list.cc
 
 # stuff for MP

Singular/extra.cc

@@ -3723 +3723 @@
   else
 #endif
+    if (strcmp(sys_cmd,"denom_list")==0)
+      {
+        res->rtyp=LIST_CMD;
+        extern lists get_denom_list();
+        res->data=(lists)get_denom_list();
+        return FALSE;
+      }
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

kernel/kInline.cc

@@ -19 +19 @@
 #include <kernel/kbuckets.h>
 #include <omalloc/omalloc.h>
+#include <kernel/options.h>
 
 #define HAVE_TAIL_BIN
@@ -423 +424 @@
 {
   assume(p != NULL);
-  if (t_p != NULL)
-  {
-    p_Cleardenom(t_p, tailRing);
-    pSetCoeff0(p, pGetCoeff(t_p));
-  }
-  else
-  {
-    #ifdef HAVE_RATGRING
-    p= p_Cleardenom(p, currRing);
-    #else
-    p_Cleardenom(p, currRing);
-    #endif
-  }
+  if (TEST_OPT_CONTENTSB)
+    {
+      number n;
+      if (t_p != NULL)
+        {
+          p_Cleardenom_n(t_p, tailRing, n);
+          pSetCoeff0(p, pGetCoeff(t_p));
+        }
+      else
+        {
+#ifdef HAVE_RATGRING
+          p= p_Cleardenom_n(p, currRing, n);
+#else
+          p_Cleardenom_n(p, currRing, n);
+#endif
+        }
+      if (!nIsOne(n))
+        {
+          denominator_list denom=(denominator_list)omAlloc(sizeof(denominator_list_s));
+          denom->n=nInvers(n);
+          denom->next=DENOMINATOR_LIST;
+          DENOMINATOR_LIST=denom;
+        }
+      nDelete(&n);
+    }
+  else
+    {
+      if (t_p != NULL)
+        {
+          p_Cleardenom(t_p, tailRing);
+          pSetCoeff0(p, pGetCoeff(t_p));
+        }
+      else
+        {
+#ifdef HAVE_RATGRING
+          p= p_Cleardenom(p, currRing);
+#else
+          p_Cleardenom(p, currRing);
+#endif
+        }
+    }
 }
 

kernel/kutil.cc

@@ -70 +70 @@
 #define KDEBUG 2
 #endif
+
+denominator_list DENOMINATOR_LIST=NULL;
 
 
@@ -5399 +5401 @@
             if (TEST_OPT_INTSTRATEGY)
             {
-              //pContent(strat->S[i]);
-              strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
+              if (TEST_OPT_CONTENTSB)
+                {
+                  number n;
+                  p_Cleardenom_n(strat->S[i], currRing, n);// also does a pContent
+                  if (!nIsOne(n))
+                    {
+                      denominator_list denom=(denominator_list)omAlloc(sizeof(denominator_list_s));
+                      denom->n=nInvers(n);
+                      denom->next=DENOMINATOR_LIST;
+                      DENOMINATOR_LIST=denom;
+                    }
+                  nDelete(&n);
+                }
+              else
+                {
+                  //pContent(strat->S[i]);
+                  strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
+                }
             }
             else
@@ -5470 +5488 @@
             if (TEST_OPT_INTSTRATEGY)
             {
-              strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
+              if (TEST_OPT_CONTENTSB)
+                {
+                  number n;
+                  p_Cleardenom_n(strat->S[i], currRing, n);// also does a pContent
+                  if (!nIsOne(n))
+                    {
+                      denominator_list denom=(denominator_list)omAlloc(sizeof(denominator_list_s));
+                      denom->n=nInvers(n);
+                      denom->next=DENOMINATOR_LIST;
+                      DENOMINATOR_LIST=denom;
+                    }
+                  nDelete(&n);
+                }
+              else
+                {
+                  //pContent(strat->S[i]);
+                  strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
+                }
             }
             else
@@ -6121 +6156 @@
         strat->S[i] = redtail(strat->S[i], strat->sl, strat);
       if (TEST_OPT_INTSTRATEGY)
-        strat->S[i]=p_Cleardenom(strat->S[i], currRing);
+        {
+          if (TEST_OPT_CONTENTSB)
+            {
+              number n;
+              p_Cleardenom_n(strat->S[i], currRing, n);// also does a pContent
+              if (!nIsOne(n))
+                {
+                  denominator_list denom=(denominator_list)omAlloc(sizeof(denominator_list_s));
+                  denom->n=nInvers(n);
+                  denom->next=DENOMINATOR_LIST;
+                  DENOMINATOR_LIST=denom;
+                }
+              nDelete(&n);
+            }
+          else
+            {
+              //pContent(strat->S[i]);
+              strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
+            }
+        }
     }
     if (TEST_OPT_PROT)

kernel/kutil.h

@@ -55 +55 @@
 typedef TObject * TSet;
 typedef LObject * LSet;
+
+typedef struct denominator_list_s denominator_list_s;
+typedef denominator_list_s *denominator_list;
+
+struct denominator_list_s{number n; denominator_list next;};
+extern denominator_list DENOMINATOR_LIST;
 
 class sTObject

kernel/polys1.cc

@@ -515 +515 @@
   poly p;
 
-  if(TEST_OPT_CONTENTSB) return;
+  //  if(TEST_OPT_CONTENTSB) return;
   if(pNext(ph)==NULL)
   {
@@ -657 +657 @@
 void pSimpleContent(poly ph,int smax)
 {
-  if(TEST_OPT_CONTENTSB) return;
+  //if(TEST_OPT_CONTENTSB) return;
   if (ph==NULL) return;
   if (pNext(ph)==NULL)
@@ -714 +714 @@
 #if 0
 {
-  assume(!TEST_OPT_CONTENTSB);
+  //assume(!TEST_OPT_CONTENTSB);
   assume(ph!=NULL);
   assume(pNext(ph)!=NULL);
@@ -966 +966 @@
   if(pNext(p)==NULL)
   {
+    /*
     if (TEST_OPT_CONTENTSB)
     {
@@ -978 +979 @@
     }
     else
+    */
       pSetCoeff(p,nInit(1));
   }