Changeset 48d66a in git

Timestamp:

Feb 3, 2015, 3:11:57 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7023cea48460891d8d8145b55190cccabdc80741bbd7c81bbd8e197270854c2e529e9a7d6479dc49

Parents:

1d0b91fbec50d1a0fc884eb1fe44cf48dfd0ff8e

Message:

system("denom_list")

Files:

• Singular/extra.cc (modified) (4 diffs)
• Singular/ipshell.cc (modified) (2 diffs)
• doc/reference.doc (modified) (previous)

Singular/extra.cc

@@ -613 +613 @@
     }
     else
-  /*==================== complexNearZero ======================*/
+    /*======================= demon_list =====================*/
+    if (strcmp(sys_cmd,"denom_list")==0)
+    {
+      res->rtyp=LIST_CMD;
+      extern lists get_denom_list();
+      res->data=(lists)get_denom_list();
+      return FALSE;
+    }
+    else
+    /*==================== complexNearZero ======================*/
     if(strcmp(sys_cmd,"complexNearZero")==0)
     {
@@ -863 +872 @@
       {
         int id=0;
-        char *n=(char*)h->Data();
+        char *n=(char*)h->Data();
         blackboxIsCmd(n,id);
         if (id>0)
@@ -874 +883 @@
             return FALSE;
           }
-          else Werror("'%s' is not a newstruct",n);
-        }
-        else Werror("'%s' is not a blackbox object",n);
+          else Werror("'%s' is not a newstruct",n);
+        }
+        else Werror("'%s' is not a blackbox object",n);
       }
       return TRUE;
@@ -3422 +3431 @@
 
   #endif
-/*======================= demon_list =====================*/
-  if (strcmp(sys_cmd,"denom_list")==0)
-  {
-    res->rtyp=LIST_CMD;
-    extern lists get_denom_list();
-    res->data=(lists)get_denom_list();
-    return FALSE;
-  }
-  else
   /*==================== mpz_t loader ======================*/
     if(strcmp(sys_cmd, "GNUmpLoad")==0)

Singular/ipshell.cc

@@ -44 +44 @@
 #include <kernel/GBEngine/syz.h>
 #include <kernel/GBEngine/kstd1.h>
+#include <kernel/GBEngine/kutil.h> // denominator_list
 
 #include <kernel/combinatorics/stairc.h>
@@ -4802 +4803 @@
   }
 
+  if ((rg!=currRing)&&(currRing!=NULL))
+  {
+    denominator_list dd=DENOMINATOR_LIST;
+    if (DENOMINATOR_LIST!=NULL)
+    {
+      if (TEST_V_ALLWARN)
+        Warn("deleting denom_list for ring change to %s",IDID(h));
+      do
+      {
+        n_Delete(&(dd->n),currRing->cf);
+        dd=dd->next;
+        omFree(DENOMINATOR_LIST);
+        DENOMINATOR_LIST=dd;
+      } while(DENOMINATOR_LIST!=NULL);
+    }
+  }
+
   // test for valid "currRing":
   if ((rg!=NULL) && (rg->idroot==NULL))