Changeset e7e815 in git

Timestamp:

Aug 12, 2011, 8:35:56 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

f5bef2f630405aa4f809d8c3e3d981f72f87a74d

Parents:

2b7f4e1c2533023f1826c2b3ff11a6470249af65

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 20:35:56+02:00

git-committer:

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

Message:

FIX: rCompose uses nInitChar now!

File:

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

Singular/ipshell.cc

@@ -61 +61 @@
 
 #include <math.h>
+
+#include <polys/ext_fields/algext.h>
+#include <polys/ext_fields/transext.h>
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -2078 +2081 @@
   // 4: C
   // 5: D
-  ring R = (ring) omAlloc0Bin(sip_sring_bin);
+  
+  ring R = (ring) omAlloc0Bin(sip_sring_bin); // why 
    
    
-  assume( R->cf == NULL );   
-  int ch;
-  int is_gf_char = 0;
-   
+  assume( R->cf == NULL );
+  
   // ------------------------------------------------------------------
   // 0: char:
   if (L->m[0].Typ()==INT_CMD)
   {
-    ch = (int)(long)L->m[0].Data();
+    int ch = (int)(long)L->m[0].Data();
     assume( ch >= 0 );
-     
-     
-    if (ch != -1) // WTF?
-    {
-      int l=0;
-       
-      if (
-          ((ch!=0) && (ch<2) && (is_gf_char=-1)) // TODO for Hans!: negative characteristic?
-      #ifndef NV_OPS
-      || (ch > 32003)
-      #endif
-      || ((l=IsPrime(ch))!=ch)
-      )
-      {
-        Warn("%d is invalid characteristic of ground field. %d is used.", ch,l);
+
+    if (ch == 0) // Q?
+      R->cf = nInitChar(n_Q, NULL);
+    else
+    {
+      int l = IsPrime(ch); // Zp?
+      if( l != ch )
+      {
+        Warn("%d is invalid characteristic of ground field. %d is used.", ch, l);
         ch = l;
-      }
-    }
-  }
-  else if (L->m[0].Typ()==LIST_CMD)
+      }      
+      R->cf = nInitChar(n_Zp, (void*)ch);       
+    }
+  }
+  else if (L->m[0].Typ()==LIST_CMD) // something complicated...
   {
     lists LL=(lists)L->m[0].Data();
+    
 #ifdef HAVE_RINGS
-    if (LL->m[0].Typ() == STRING_CMD)
-    {
-      rComposeRing(LL,R); /* Ring */
+    if (LL->m[0].Typ() == STRING_CMD) // 1st comes a string?
+    {
+      rComposeRing(LL, R); // Ring!?
     }
     else
 #endif
-    if (LL->nr<3)
-      rComposeC(LL,R); /* R, long_R, long_C */
+    if (LL->nr < 3)
+      rComposeC(LL,R); // R, long_R, long_C
     else
-    {
+    {      
       if (LL->m[0].Typ()==INT_CMD)
-      {
+      {        
         ch = (int)(long)LL->m[0].Data();
-         
-        // 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;
-      }
-       
-      if (is_gf_char==-1)
+
+        if( ch != 0 ) // TODO: GF-Test ch!
+        {
+          GFInfo param;
+        
+          param.GFChar = ch; 
+          param.GFDegree = 1;
+          param.GFPar_name = (const char*)(((lists)(LL->m[1].Data()))->m[0].Data());
+
+          // nfInitChar should be able to handle the case when ch is in fftables!
+          R->cf = nInitChar(n_GF, (void*)&param);
+        }
+      }
+
+      if( R->cf == NULL )
       {
         ring extRing = rCompose((lists)L->m[0].Data());
@@ -2140 +2145 @@
         if (extRing==NULL)
         {
-          WerrorS("could not create rational function coefficient field");
+          WerrorS("could not create the specified coefficient field");
           goto rCompose_err;
         }
-        if (extRing->cf->ch > 0)
-          ch = - extRing->cf->ch; // TODO: this is obsolete!
-        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)
+
+        if( extRing->qideal != NULL ) // Algebraic extension
         {
-          if (IDELEMS(extRing->qideal) == 1)
-          {
-            extRing->qideal->m[0] = naInit(1,R);
-            lnumber n=(lnumber)R->minpoly;
-            n->z = extRing->qideal->m[0];
-//            naMinimalPoly = n->z;
-            R->cf->extRing->qideal->m[0]=NULL;
-            idDelete(&(R->cf->extRing->qideal));
-             
-            redefineFunctionPointers();
-          }
-          else
-          {
-            WerrorS("not implemented yet.");
-          }
+          AlgExtInfo extParam;
+          
+          extParam.i = extRing->qideal;
+          extParam.r = extRing;
+
+          extRing->qideal = NULL; // ???
+
+          R->cf = nInitChar(type, (void*)&extParam); 
+        } else // Transcendental extension
+        {
+          TransExtInfo extParam;
+          extParam.r = r;
+
+          R->cf = nInitChar(n_transExt, &extParam);
         }
-*/
-      }
-      else
-      { // gf-char
-//        ch = fftable[is_gf_char];
-        extRing->N=1;
-        extRing->names=(char**)omAlloc0(1*sizeof(char_ptr));
-        extRing->names[0]=omStrDup((char*)((lists)(LL->m[1].Data()))->m[0].Data());
-      }
+        
+      }     
     }
   }
@@ -2189 +2175 @@
     goto rCompose_err;
   }
-  rRenameVars(R);
-  rComplete(R);
-   
-#ifdef HAVE_RINGS 
-  // This was a BUG IN SINGULAR: There is no HABE_RINGS!!!
-   
-// currently, coefficients which are ring elements require a global ordering:
-  if (rField_is_Ring(R) && (R->pOrdSgn==-1))
-  {
-    WerrorS("global ordering required for these coefficients");
+
+  if( R->cf == NULL )
+  {
+    WerrorS("could not create coefficient field described by the input!");
     goto rCompose_err;
   }
-#endif
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
   // ------------------------- VARS ---------------------------
   if (L->m[1].Typ()==LIST_CMD)
@@ -2407 +2378 @@
     goto rCompose_err;
   }
+
+  // ------------------------ ??????? --------------------
+
+  rRenameVars(R);
+  rComplete(R);
+
+#ifdef HAVE_RINGS 
+  // This was a BUG IN SINGULAR: There is no HABE_RINGS!!!
+
+// currently, coefficients which are ring elements require a global ordering:
+  if (rField_is_Ring(R) && (R->pOrdSgn==-1))
+  {
+    WerrorS("global ordering required for these coefficients");
+    goto rCompose_err;
+  }
+#endif
+
+
   // ------------------------ Q-IDEAL ------------------------