Changeset 3373e32 in git

Timestamp:

Aug 12, 2011, 8:14:45 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

3da9f4eecf506fa238a5377a07d73051db6ceb9b

Parents:

8c6ae50ebf0a50c5c19b2b5b0dad7b35be193f9b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 20:14:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:30:46+01:00

Message:

rewrite rInit

File:

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

Singular/ipshell.cc

@@ -2098 +2098 @@
        
       if (
-          ((ch!=0) && (ch<2) && (is_gf_char=-1)) // TODO for Hans!: negative characteristic?
+          ((ch!=0) && (ch<2) && (is_gf_char=-1)) // TODO for Hans!: negative characteristic?
       #ifndef NV_OPS
       || (ch > 32003)
@@ -2127 +2127 @@
       {
         ch = (int)(long)LL->m[0].Data();
-         
-        // TODO: check that ch is a supported (by our GF impl.) power of a prime
+         
+        // TODO: check that ch is a supported (by our GF impl.) power of a prime
         while ((ch != fftable[is_gf_char]) && (fftable[is_gf_char])) is_gf_char++;
-         
+         
         if (fftable[is_gf_char]==0) is_gf_char=-1;
       }
@@ -2137 +2137 @@
       {
         ring extRing = rCompose((lists)L->m[0].Data());
-        
+        
         if (extRing==NULL)
         {
@@ -2147 +2147 @@
         else
           ch = 1; // WTF?
-         
+         
 //        extRing->names = (char**)omAlloc0(rPar(R)*sizeof(char_ptr)); // obsolete?
-         
+         
         int i;
-         
+         
 //        for( i = rPar(R) - 1; i >= 0; i--) extRing->names[i] = omStrDup(extRing->names[i]);
-/*      
+/*        
         // Obsolete?
         if (extRing->qideal!=NULL)
@@ -2165 +2165 @@
             R->cf->extRing->qideal->m[0]=NULL;
             idDelete(&(R->cf->extRing->qideal));
-             
+             
             redefineFunctionPointers();
           }
@@ -2308 +2308 @@
       if (R->block1[j]>R->N)
       {
-        R->block1[j]=R->N;
-        iv_len=R->block1[j]-R->block0[j]+1;
+        R->block1[j]=R->N;
+        iv_len=R->block1[j]-R->block0[j]+1;
       }
       //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
@@ -2333 +2333 @@
            R->block1[j]=si_max(R->block0[j],R->block0[j]+(int)sqrt((double)(iv->length()-1)));
            if (R->block1[j]>R->N)
-           {
-             WerrorS("ordering matrix too big");
-             goto rCompose_err;
-           }
+           {
+             WerrorS("ordering matrix too big");
+             goto rCompose_err;
+           }
            break;
          case ringorder_ls:
@@ -2821 +2821 @@
 {
   res->data=singclap_resultant((poly)u->CopyD(),(poly)v->CopyD(),
-                  (poly)w->CopyD(), currRing);
+                  (poly)w->CopyD(), currRing);
   return errorreported;
 }
@@ -3276 +3276 @@
                ( fast==1 ? computeWC( nph,(Rational)rVar(currRing), currRing ) :
               /* fast==2 */computeWC( nph,
-                      ((Rational)rVar(currRing))/(Rational)2, currRing ) ) );
+                      ((Rational)rVar(currRing))/(Rational)2, currRing ) ) );
 
   #ifdef SPECTRUM_DEBUG
@@ -4176 +4176 @@
 
   if ( !(rField_is_R(currRing) || rField_is_long_R(currRing) || \
-                          rField_is_long_C(currRing)) )
+                          rField_is_long_C(currRing)) )
   {
     unsigned long int ii = (unsigned long int)arg2->Data();
@@ -4189 +4189 @@
 
   int ldummy;
-  int deg= pLDeg( gls, &ldummy, currRing );
+  int deg= currRing->pLDeg( gls, &ldummy, currRing );
   //  int deg= pDeg( gls );
   int len= pLength( gls );
@@ -4437 +4437 @@
     return TRUE;
   else if ( !(rField_is_R(currRing) || rField_is_long_R(currRing) || \
-                          rField_is_long_C(currRing)) )
+                          rField_is_long_C(currRing)) )
   {
     unsigned long int ii=(unsigned long int)v->Data();
@@ -4573 +4573 @@
           onepoint->m[j].rtyp=STRING_CMD;
           onepoint->m[j].data=(void *)complexToStr((*roots[j])[i],oprec,
-                          currRing->cf);
+                          currRing->cf);
         }
         else
@@ -4949 +4949 @@
   // get ch of ground field
   int numberOfAllocatedBlocks;
+  
+  coeffs cf=NULL;
 
   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);
+    else
+    {
+      if ((ch!=0) && (ch!=IsPrime(ch)))
+      {
+        cf=nInitChar(n_GF,(void*)(long)ch);
+        if (cf==NULL) goto rInitError;
+        else ffChar=TRUE;
+      }
+      /* parameter -------------------------------------------------------*/
+      pn=pn->next;
+      if (cf==NULL) cf=nInitChar(n_transExt,NULL);
+      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))
+        {
+          WerrorS("parameter expected");
+          goto rInitError;
+        }
+      }
+    }
   }
   else if ((pn->name != NULL)
@@ -4958 +4991 @@
   {
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
-    ch=-1;
+    ch=0;
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
+      WarnS("not implemented: size for real/complex");
       float_len=(int)(long)pn->next->Data();
       float_len2=float_len;
@@ -4967 +5001 @@
       {
         float_len2=(int)(long)pn->next->Data();
+        WarnS("not implemented: size for real/complex");
         pn=pn->next;
       }
@@ -4975 +5010 @@
       pn->next->name=omStrDup("i");
     }
+    else
+      WarnS("not implemented: name for i (complex)");
+    cf=nInitChar(complex_flag ? n_long_C: n_long_R,NULL);
   }
 #ifdef HAVE_RINGS
@@ -4996 +5034 @@
       }
     }
+    else
+      cf=nInitChar(n_Z,NULL);
     if ((mpz_cmp_ui(modBase, 1) == 0) && (mpz_cmp_ui(modBase, 0) < 0))
     {
@@ -5006 +5046 @@
       goto rInitError;
     }
-    // module is 0 ---> integers
-    if (mpz_cmp_ui(modBase, 0) == 0)
-    {
-      ch = 0;
-      ringtype = 4;
-    }
+    // module is 0 ---> integers ringtype = 4;
     // we have an exponent
-    else if (modExponent > 1)
+    if (modExponent > 1)
     {
       ch = modExponent;
@@ -5021 +5056 @@
            depending on the size of a long on the respective platform */
         ringtype = 1;       // Use Z/2^ch
+        cf=nInitChar(n_Z2m,(void*)(long)modExponent);
       }
       else
       {
         ringtype = 3;
+        cf=nInitChar(n_Zn,(void*)(long)modBase);
       }
     }
@@ -5032 +5069 @@
       ringtype = 2;
       ch = mpz_get_ui(modBase);
+      cf=nInitChar(n_Zn,(void*)(long)modBase);
     }
   }
@@ -5056 +5094 @@
    *         q    q : GF(q=p^n)       *names         TRUE
   */
-  if ((ch!=-1)
-#ifdef HAVE_RINGS
-       && (ringtype == 0)
-#endif
-     )
-  {
-    int l = 0;
-
-    if (((ch!=0) && (ch<2))
-    #ifndef NV_OPS
-    || (ch > 32003)
-    #endif
-    )
-    {
-      Warn("%d is invalid characteristic of ground field. 32003 is used.", ch);
-      ch=32003;
-    }
-    // load fftable, if necessary
-    if (pn!=NULL)
-    {
-      while ((ch!=fftable[l]) && (fftable[l])) l++;
-      if (fftable[l]==0) ch = IsPrime(ch);
-      else
-      {
-        char *m[1]={(char *)sNoName};
-        nfSetChar(ch,m);
-        if (errorreported) goto rInitError;
-        else ffChar=TRUE;
-      }
-    }
-    else
-    {
-      ch = IsPrime(ch);
-    }
+  l = 0;
+
+  if (cf==NULL)
+  {
+    Warn("%d is invalid characteristic of ground field. 32003 is used.", ch);
+    ch=32003;
+    cf=nInitChar(n_Zp, (void*)(long)ch);
   }
   // allocated ring and set ch
   R = (ring) omAlloc0Bin(sip_sring_bin);
-  R->cf->ch = ch;
+  R->cf=cf;
 #ifdef HAVE_RINGS
   R->cf->ringtype = ringtype;
@@ -5099 +5110 @@
   R->cf->modExponent = modExponent;
 #endif
-  if (ch == -1)
-  {
-    R->float_len= si_min(float_len,32767);
-    R->float_len2= si_min(float_len2,32767);
-  }
-
-  /* parameter -------------------------------------------------------*/
-  if (pn!=NULL)
-  {
-    R->cf->extRing->N=pn->listLength();
-    //if ((ffChar|| (ch == 1)) && (rPar(R) > 1))
-    if ((rPar(R) > 1) && (ffChar || (ch == -1)))
-    {
-      WerrorS("too many parameters");
-      goto rInitError;
-    }
-    R->cf->extRing->names=(char**)omAlloc0(rPar(R)*sizeof(char_ptr));
-    if (rSleftvList2StringArray(pn, R->cf->extRing->names))
-    {
-      WerrorS("parameter expected");
-      goto rInitError;
-    }
-    if (ch>1 && !ffChar) R->cf->ch=-ch;
-    else if (ch==0) R->cf->ch=1;
-  }
-  else if (ffChar)
-  {
-    WerrorS("need one parameter");
-    goto rInitError;
-  }
-  /* post-processing of field description */
-  // we have short reals, but no short complex
-  if ((R->cf->ch == - 1)
-  && (rParameter(R) !=NULL)
-  && (R->float_len < SHORT_REAL_LENGTH))
-  {
-    R->float_len = SHORT_REAL_LENGTH;
-    R->float_len2 = SHORT_REAL_LENGTH;
-  }
 
   /* names and number of variables-------------------------------------*/