Changeset 6c4db17 in git

Timestamp:

Feb 3, 2010, 5:26:55 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

40f802d6d4a86bc39b087948ef1c21fcaf01afca

Parents:

54c5581bde5de8f3d41ede0ba11f3ba4b1c1b9c2

Message:

option(qringNF), track 149

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

Files:

• Singular/ChangeLog (modified) (1 diff)
• Singular/attrib.cc (modified) (3 diffs)
• Singular/ipassign.cc (modified) (6 diffs)
• Singular/ipid.h (modified) (1 diff)
• Singular/subexpr.cc (modified) (1 diff)
• Singular/tesths.cc (modified) (1 diff)
• kernel/febase.cc (modified) (1 diff)
• kernel/misc.cc (modified) (1 diff)
• kernel/options.h (modified) (2 diffs)

Singular/ChangeLog

@@ -5 +5 @@
   (install does not include profiling stuff any more)
 - updated: doc w.r.t. option(...)
+- new option: qringNF (track 149)
 
 Changes w.r.t 3-1-0-8:

Singular/attrib.cc

@@ -262 +262 @@
     haveNoAttribute=FALSE;
   }
-  else if (((t=v->Typ())==RING_CMD)||(t==QRING_CMD))
+  if (hasFlag(v,FLAG_QRING))
+  {
+    PrintS("attr:qringNF, type int\n");
+    haveNoAttribute=FALSE;
+  }
+  if (((t=v->Typ())==RING_CMD)||(t==QRING_CMD))
   {
     PrintS("attr:global, type int\n");
@@ -297 +302 @@
     res->data=(void *)(((ring)v->Data())->OrdSgn==1);
   }
+  else if (strcmp(name,"qringNF")==0)
+  {
+    res->rtyp=INT_CMD;
+    res->data=(void *)(long)hasFlag(v,FLAG_QRING);
+  }
 #ifdef HAVE_SHIFTBBA
   else if ((strcmp(name,"isLPring")==0)
@@ -352 +362 @@
     }
   }
+  else if (strcmp(name,"qringNF")==0)
+  {
+    if (c->Typ()!=INT_CMD)
+    {
+      WerrorS("attribute qringNF must be int");
+      return TRUE;
+    }
+    if (((long)c->Data())!=0L)
+    {
+      if (h!=NULL) setFlag(h,FLAG_QRING);
+      setFlag(v,FLAG_QRING);
+    }
+    else
+    {
+      if (h!=NULL) resetFlag(h,FLAG_QRING);
+      resetFlag(v,FLAG_QRING);
+    }
+  }
   else if ((strcmp(name,"rank")==0)&&(v->Typ()==MODUL_CMD))
   {

Singular/ipassign.cc

@@ -359 +359 @@
     }
   }
+  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingP(res);
   return FALSE;
 }
@@ -462 +463 @@
     setFlag(res,FLAG_STD);
   }
+  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -479 +481 @@
   pNormalize(I->m[0]);
   res->data=(void *)I;
+  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -490 +493 @@
   idNormalize((ideal)m);
   res->data=(void *)m;
+  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -968 +972 @@
   l1->CleanUp();
   r->CleanUp();
+  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingP(l);
   return FALSE;
 }
@@ -1617 +1622 @@
   return nok;
 }
+void jjNormalizeQRingId(leftv I)
+{
+  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
+  {
+    if (I->e==NULL)
+    {
+      ideal F=idInit(1,1);
+      ideal I0=(ideal)I->Data();
+      ideal II=kNF(F,currQuotient,I0);
+      idDelete(&F);
+      if ((I->rtyp==IDEAL_CMD) 
+      || (I->rtyp==MODUL_CMD)
+      )
+      {
+        idDelete((ideal*)&(I0));
+        I->data=II;
+      }
+      else if (I->rtyp==IDHDL)
+      {
+        idhdl h=(idhdl)I->data;
+        idDelete((ideal*)&IDIDEAL(h));
+        IDIDEAL(h)=II;
+        setFlag(h,FLAG_QRING);
+      }
+      else
+      {
+        idDelete(&II);
+      }
+      setFlag(I,FLAG_QRING);
+    }
+  }
+}
+void jjNormalizeQRingP(leftv I)
+{
+  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
+  {
+    if (I->e==NULL)
+    {
+      ideal F=idInit(1,1);
+      poly II=kNF(F,currQuotient,(poly)I->Data());
+      idDelete(&F);
+      if ((I->rtyp==POLY_CMD) 
+      || (I->rtyp==VECTOR_CMD))
+      {
+        pDelete((poly*)&(I->data));
+        I->data=II;
+      }
+      else if (I->rtyp==IDHDL)
+      {
+        idhdl h=(idhdl)I->data;
+        pDelete((poly*)&IDPOLY(h));
+        IDPOLY(h)=II;
+        setFlag(h,FLAG_QRING);
+      }
+      else
+      {
+        pDelete(&II);
+      }
+      setFlag(I,FLAG_QRING);
+    }
+  }
+}
 BOOLEAN jjIMPORTFROM(leftv res, leftv u, leftv v)
 {

Singular/ipid.h

@@ -89 +89 @@
 BOOLEAN checkPackage(package pack);
 idhdl packFindHdl(package r);
+void jjNormalizeQRingId(leftv I);
+void jjNormalizeQRingP(leftv I);
 
 #define FLAG_STD   0
 #define FLAG_TWOSTD  3
+#define FLAG_QRING   4
 #define hasFlag(A,F) Sy_inset((F),(A)->flag)
 #define setFlag(A,F) (A)->flag|=Sy_bit(F)

Singular/subexpr.cc

@@ -122 +122 @@
           iiWriteMatrix((matrix)d,n,2,spaces);
           break;
-        case MAP_CMD:
         case MODUL_CMD:
         case IDEAL_CMD:
+          if ((TEST_V_QRING)  &&(currQuotient!=NULL))
+          {
+            jjNormalizeQRingId(this);
+            d=Data();
+          }
+          // no break:
+        case MAP_CMD:
           iiWriteMatrix((matrix)d,n,1,spaces);
           break;
         case POLY_CMD:
         case VECTOR_CMD:
+          if ((TEST_V_QRING)  &&(currQuotient!=NULL))
+          {
+            jjNormalizeQRingP(this);
+            d=Data();
+          }
           PrintNSpaces(spaces);
           pWrite0((poly)d);

Singular/tesths.cc

@@ -210 +210 @@
     basePackHdl=h;
   }
-  if (BVERBOSE(0))
+  if (TEST_V_QUIET)
   {
     (printf)(

kernel/febase.cc

@@ -49 +49 @@
 extern "C" {
 BITSET  test=(BITSET)0;
-BITSET  verbose = 1
+BITSET  verbose = Sy_bit(V_QUIET)
+                  //| Sy_bit(V_QRING) // not default, as speed drops by 10 %
                   | Sy_bit(V_REDEFINE)
                   | Sy_bit(V_LOAD_LIB)

kernel/misc.cc

@@ -78 +78 @@
     if (!tclmode)
     #endif
-      if (BVERBOSE(0))
+      if (TEST_V_QUIET)
       {
         if (i==0)

kernel/options.h

@@ -33 +33 @@
 */
 
+#define V_QUIET       0
 #define V_QRING       1
 #define V_SHOW_MEM    2
@@ -114 +115 @@
 #define TEST_V_QRING               BVERBOSE(V_QRING)
 #define TEST_V_NSB                 BVERBOSE(V_NSB)
+#define TEST_V_QUIET               BVERBOSE(V_QUIET)
 
 #define TEST_VERB_NSB              BVERBOSE(V_NSB)