Changeset e20910 in git

Timestamp:

Sep 14, 2011, 7:00:07 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

8b87135f40450a46d90d5e08617044b9d4b56918

Parents:

a55ef037cdd445d3fc4149a3d95a4ebaecf3c2f5

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-14 19:00:07+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:49+01:00

Message:

FIX: ring declaration / building via rInit now actually supports parameters
ADD: initial support for building towers of rings/qrings, e.g. ring r = OldRing, (VARs), (ORDSTR);

File:

• Singular/ipshell.cc (modified) (8 diffs)

Singular/ipshell.cc

@@ -4932 +4932 @@
 ring rInit(sleftv* pn, sleftv* rv, sleftv* ord)
 {
-  int ch;
 #ifdef HAVE_RINGS
   unsigned int ringtype = 0;
@@ -4949 +4948 @@
   int numberOfAllocatedBlocks;
   
-  coeffs cf=NULL;
   // allocated ring
   R = (ring) omAlloc0Bin(sip_sring_bin);
 
+  coeffs cf = NULL;
+
+  assume( pn != NULL );
+  const int P = pn->listLength();
+  
   if (pn->Typ()==INT_CMD)
   {
-    ch=(int)(long)pn->Data();
-    if (pn->next==NULL)
-      cf=nInitChar(ch==0 ? n_Q : n_Zp, (void*)(long)ch);
+    const int ch = (int)(long)pn->Data();
+    
+    /* parameter? -------------------------------------------------------*/
+    pn = pn->next;
+    
+    if (pn == NULL) // no params!?
+      cf = nInitChar(ch==0 ? n_Q : n_Zp, (void*)(long)ch);
     else
     {
-      if ((ch!=0) && (ch!=IsPrime(ch)))
+      const int pars = pn->listLength();
+
+      assume( pars > 0 );
+
+      // predefined finite field: (p^k, a)
+      if ((ch!=0) && (ch!=IsPrime(ch)) && (pars == 1))
       {
         GFInfo param;
          
         param.GFChar = ch; 
-        param.GFDegree = 1;
-         
-        param.GFPar_name=pn->name;
-        cf=nInitChar(n_GF,&param);
+        param.GFDegree = 1;      
+        param.GFPar_name = pn->name;
         
-        if (cf==NULL) goto rInitError;
-        else ffChar=TRUE;
+        cf = nInitChar(n_GF, &param);        
+      }
+      else // (0/p, a, b, ..., z)
+      {
+        assume( (ch == 0) || (ch==IsPrime(ch)) );
+
+//         if ((pars > 1) && (ffChar))
+//         {
+//           WerrorS("too many parameters");
+//           goto rInitError;
+//         }
         
-      }
-      /* parameter -------------------------------------------------------*/
-      pn=pn->next;
-      if (cf==NULL) cf=nInitChar(n_transExt,NULL);
-      if (cf==NULL) goto rInitError;
-      R->cf=cf;
-      if (pn!=NULL)
-      {
-        int pars=pn->listLength();
-        if (!ffChar) R->cf->extRing->N=pars;
-        if ((pars > 1) && (ffChar))
-        {
-          WerrorS("too many parameters");
-          goto rInitError;
-        }
-        if (!ffChar) R->cf->extRing->names=(char**)omAlloc0(rPar(R)*sizeof(char_ptr));
-        if (rSleftvList2StringArray(pn, R->cf->extRing->names))
+        char ** names = (char**)omAlloc0(pars * sizeof(char_ptr));
+
+        if (rSleftvList2StringArray(pn, names))
         {
           WerrorS("parameter expected");
           goto rInitError;
         }
-      }
-    }
+
+        TransExtInfo extParam;
+        
+        extParam.r = rDefault( ch, pars, names); // Q/Zp [ p_1, ... p_pars ]
+        
+        cf = nInitChar(n_transExt, &extParam);
+      }
+    }
+    
+//    if (cf==NULL) goto rInitError;
+    assume( cf != NULL );
   }
   else if ((pn->name != NULL)
@@ -5001 +5015 @@
   {
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
-    ch=0;
+    const int ch=0;
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
@@ -5023 +5037 @@
       WarnS("not implemented: name for i (complex)");
     cf=nInitChar(complex_flag ? n_long_C: n_long_R,NULL);
+
+    assume( cf != NULL );
   }
 #ifdef HAVE_RINGS
@@ -5046 +5062 @@
     else
       cf=nInitChar(n_Z,NULL);
+    
     if ((mpz_cmp_ui(modBase, 1) == 0) && (mpz_cmp_ui(modBase, 0) < 0))
     {
@@ -5060 +5077 @@
     if (modExponent > 1)
     {
-      ch = modExponent;
+      const int ch = modExponent;
       if ((mpz_cmp_ui(modBase, 2) == 0) && (modExponent <= 8*sizeof(NATNUMBER)))
       {
@@ -5078 +5095 @@
     {
       ringtype = 2;
-      ch = mpz_get_ui(modBase);
-      cf=nInitChar(n_Zn,(void*)(long)modBase);
-    }
+      const int ch = mpz_get_ui(modBase);
+      cf=nInitChar(n_Zn,(void*)(long)ch);
+    }
+    assume( cf != NULL );
   }
 #endif
+  // ring NEW = OLD, (), (); where OLD is a polynomial ring...
+  else if ((pn->Typ()==RING_CMD) && (P == 1))
+  {
+    TransExtInfo extParam;
+    extParam.r = (ring)pn->Data();
+    cf = nInitChar(n_transExt, &extParam);
+  }
+  else if ((pn->Typ()==QRING_CMD) && (P == 1)) // same for qrings - which should be fields!?
+  {
+    AlgExtInfo extParam;
+    extParam.r = (ring)pn->Data();
+    extParam.i = (extParam.r->qideal);
+    
+    cf = nInitChar(n_algExt, &extParam);   // Q[a]/<minideal>
+  }
   else
   {
-    Werror("Wrong ground field specification");
+    sleftv* p = pn;
+    Werror("Wrong or unknown ground field specification");
+#ifndef NDEBUG
+    while (p != NULL)
+    {
+      Print( "pn[%p]: type: %d [%s]: %p, name: %s", p, p->Typ(), Tok2Cmdname(p->Typ()), p->Data(), (p->name == NULL? "NULL" : p->name) );
+      PrintLn();
+      p = p->next;
+    }
+#endif    
     goto rInitError;
   }
-  pn=pn->next;
+//  pn=pn->next;
 
   int l, last;
@@ -5108 +5150 @@
   if (cf==NULL)
   {
-    Warn("%d is invalid characteristic of ground field. 32003 is used.", ch);
-    ch=32003;
+    const int ch=32003;
+    Warn("Invalid ground field specification: using the default field: Z_{%d}", ch);
     cf=nInitChar(n_Zp, (void*)(long)ch);
   }
-  R->cf=cf;
+
+  assume( R != NULL );
+  
+  R->cf = cf;
+  
 #ifdef HAVE_RINGS
-  R->cf->ringtype = ringtype;
-  R->cf->modBase = modBase;
-  R->cf->modExponent = modExponent;
+  // the following should have beed set already into cf, right?!
+//  R->cf->ringtype = ringtype;
+//  R->cf->modBase = modBase;
+//  R->cf->modExponent = modExponent;
 #endif