Changeset 83a1714 in git

Timestamp:

Sep 29, 2011, 6:29:37 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

172bbb269fb8ec8ad467f6d62ee5ea9c0151b3ba

Parents:

bebd746739b98e1580e2d7b75cf326c9350f2a7b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-29 18:29:37+02:00

git-committer:

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

Message:

FIX: started fixing fetch & imap for transcendental/alg. extensions: "longalg missing 2"

Files:

• Singular/maps_ip.cc (modified) (5 diffs)
• Tst/New/longalg_missing_2.tst (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (9 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

Singular/maps_ip.cc

@@ -32 +32 @@
 
 /* debug output: Tok2Cmdname in maApplyFetch*/
-//#include "ipshell.h"
+#include "ipshell.h"
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -55 +55 @@
   int i;
   int N = preimage_r->N;
-  //Print("N=%d what=%s ",N,Tok2Cmdname(what));
-  //if (perm!=NULL) for(i=1;i<=N;i++) Print("%d -> %d ",i,perm[i]);
-  //PrintS("\n");
-  //Print("P=%d ",P);
-  //if (par_perm!=NULL) for(i=0;i<P;i++) Print("%d -> %d ",i,par_perm[i]);
-  //PrintS("\n");
+#if 0
+  Print("N=%d what=%s ",N,Tok2Cmdname(what));
+  if (perm!=NULL) for(i=1;i<=N;i++) Print("%d -> %d ",i,perm[i]);
+  PrintS("\n");
+  Print("P=%d ",P);
+  if (par_perm!=NULL) for(i=0;i<P;i++) Print("%d -> %d ",i,par_perm[i]);
+  PrintS("\n");
+#endif
+
   void *data=w->Data();
   res->rtyp = w->rtyp;
@@ -68 +71 @@
       if (P!=0)
       {
-        WerrorS("Sorry 'napPermNumber' was lost in the refactoring process (due to Frank): needs to be fixed");
-        return TRUE;
-#if 0        
-        res->data=(void *)napPermNumber((number)data,par_perm,P, preimage_r);
+//        WerrorS("Sorry 'napPermNumber' was lost in the refactoring process (due to Frank): needs to be fixed");
+//        return TRUE;
+#if 1
+// poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst);
+        res->data= (void *) n_PermNumber((number)data, par_perm, P, preimage_r, currRing);
 #endif
         res->rtyp=POLY_CMD;
@@ -80 +84 @@
       else
       {
-        res->data=(void *)nMap((number)data, preimage_r->cf, currRing->cf);
+        assume( nMap != NULL );
+         
+        number a = nMap((number)data, preimage_r->cf, currRing->cf);
+        
+ 
         if (nCoeff_is_Extension(currRing->cf))
         {
-          number a=(number)res->data;
-          number one=nInit(1);
-          number product = nMult(a,one );
+          n_Normalize(a, currRing->cf); // ???
+/*
+          number a = (number)res->data;
+          number one = nInit(1);
+          number product = nMult(a, one );
           nDelete(&one);
           nDelete(&a);
           res->data=(void *)product;
+ */
         }
         #ifdef LDEBUG
-        nTest((number) res->data);
+        n_Test(a, currRing->cf);
         #endif
+        res->data=(void *)a;
+
       }
       break;
@@ -101 +114 @@
       else
       if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
-        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing,
-                        nMap,par_perm,P);
+        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
       else /*if (what==MAP_CMD)*/
       {

Tst/New/longalg_missing_2.tst

@@ -5 +5 @@
 
 SNB;
-poly f = x4-2*x+1;
-f;
+poly f = x4-2*x+1; f;
+
+poly ff = 3*a-7; ff;
+
+poly gg = 11*a; gg;
+
+poly g = a*f + f + a; g;
 
 ring SNR = 0, (x, a), (lp, C);
+
+option(Imap);
+
 imap(SNB, f);// 
+fetch(SNB, f);// 
+
+
+imap(SNB, ff);// ?
+fetch(SNB, ff);// 
+
+
+imap(SNB, g);// 
+fetch(SNB, g);// 
+
+imap(SNB, gg);// 
+fetch(SNB, gg);// 
 
 tst_status(1);$

libpolys/polys/ext_fields/transext.cc

@@ -61 +61 @@
 #define BOUND_COMPLEXITY 10   /**< maximum complexity of a number */
 
-/* some useful accessors for fractions: */
-#define IS0(f) (f == NULL) /**< TRUE iff n represents 0 in K(t_1, .., t_s) */
-
-#define DENIS1(f) (f->denominator == NULL) /**< TRUE iff den. represents 1 */
-#define NUMIS1(f) (p_IsConstant(f->numerator, cf->extRing) && \
-                   n_IsOne(p_GetCoeff(f->numerator, cf->extRing), \
+#define NUMIS1(f) (p_IsConstant(NUM(f), cf->extRing) && \
+                   n_IsOne(p_GetCoeff(NUM(f), cf->extRing), \
                            cf->extRing->cf))
                    /**< TRUE iff num. represents 1 */

libpolys/polys/ext_fields/transext.h

@@ -77 +77 @@
 #define DEN(f) (((fraction)f)->denominator)
 
+/* some useful accessors for fractions: */
+#define IS0(f) (f == NULL) 
+/**< TRUE iff n represents 0 in K(t_1, .., t_s) */
+
+#define DENIS1(f) (DEN(f) == NULL) 
+/**< TRUE iff den. represents 1 */
+
+
 number ntInit(poly p, const coeffs cf);
 

libpolys/polys/monomials/p_polys.cc

@@ -3302 +3302 @@
   return res;
 }
+
+/*2
+ * returns a re-ordered convertion of a number as a polynomial, 
+ * with permutation of parameters
+ * NOTE: this only works for Frank's alg. & trans. fields
+ */
+poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst)
+{
+#if 0
+  PrintS("\nSource Ring: \n");
+  rWrite(src);
+
+  if(0)
+  {
+    number zz = n_Copy(z, src->cf);
+    PrintS("z: "); n_Write(zz, src->cf);
+    n_Delete(&zz, src->cf);
+  }
+   
+  PrintS("\nDestination Ring: \n");
+  rWrite(dst);
+   
+  Print("\nOldPar: %d\n", OldPar);
+  for( int i = 1; i <= OldPar; i++ )
+  {
+    Print("par(%d) -> par/var (%d)\n", i, par_perm[i-1]);
+  }
+#endif
+  if( z == NULL )
+     return NULL;
+   
+  const coeffs srcCf = src->cf;
+  assume( srcCf != NULL );
+
+  assume( !nCoeff_is_GF(srcCf) );
+  assume( rField_is_Extension(src) );
+   
+  poly zz = NULL;
+   
+  const ring srcExtRing = srcCf->extRing;
+  assume( srcExtRing != NULL );
+   
+  const coeffs dstCf = dst->cf;
+  assume( dstCf != NULL );
+
+  if( nCoeff_is_algExt(srcCf) ) // nCoeff_is_GF(srcCf)?
+  {
+    zz = (poly) z;
+
+    if( zz == NULL )
+       return NULL;
+     
+  } else if (nCoeff_is_transExt(srcCf)) 
+  {   
+    assume( !IS0(z) );
+     
+    zz = NUM(z);
+    p_Test (zz, srcExtRing);
+     
+    if( zz == NULL )
+       return NULL;
+     
+    if( !DENIS1(z) )
+      WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
+  } else
+     {
+        assume (FALSE);
+        Werror("Number permutation is not implemented for this data yet!");
+        return NULL;
+     }
+   
+  assume( zz != NULL );
+  p_Test (zz, srcExtRing);
+
+  
+  nMapFunc nMap = n_SetMap(srcExtRing->cf, dstCf);
+     
+  assume( nMap != NULL );
+     
+  poly qq = p_PermPoly(zz, par_perm - 1, srcExtRing, dst, nMap, NULL, rVar(srcExtRing) );
+//       poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst, nMapFunc nMap, int *par_perm, int OldPar)
+   
+//  assume( FALSE );  WarnS("longalg missing 2");
+     
+  return qq;
+}
+
+
 /*2
 *returns a re-ordered copy of a polynomial, with permutation of the variables
 */
-poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst,
-       nMapFunc nMap, int *par_perm, int OldPar)
-{
+poly p_PermPoly (poly p, const int * perm, const ring oldRing, const ring dst,
+       nMapFunc nMap, const int *par_perm, int OldPar)
+{
+#if 0
+    p_Test(p, oldRing);
+    PrintS("\np_PermPoly::p: "); p_Write(p, oldRing, oldRing); PrintLn();
+#endif
+  
   const int OldpVariables = rVar(oldRing);
   poly result = NULL;
   poly result_last = NULL;
-  poly aq=NULL; /* the map coefficient */
+  poly aq = NULL; /* the map coefficient */
   poly qq; /* the mapped monomial */
 
@@ -3317 +3410 @@
   {
     // map the coefficient
-    if ((OldPar==0) || (rField_is_GF(oldRing)))
+    if ( ((OldPar == 0) || (par_perm == NULL) || rField_is_GF(oldRing)) && (nMap != NULL) )
     {
       qq = p_Init(dst);
+      assume( nMap != NULL );
       number n = nMap(p_GetCoeff(p, oldRing), oldRing->cf, dst->cf);
        
@@ -3331 +3425 @@
     else
     {
-      qq=p_One(dst);
-       
-      assume( FALSE ); WerrorS("longalg missing 2");
-       
-#if 0
-      aq = naPermNumber(p_GetCoeff(p, oldRing), par_perm, OldPar, oldRing); // no dst???
-#endif
+      qq = p_One(dst);       
+
+//      aq = naPermNumber(p_GetCoeff(p, oldRing), par_perm, OldPar, oldRing); // no dst???
+//      poly    n_PermNumber(const number z, const int *par_perm, const int P, const ring src, const ring dst)
+      aq = n_PermNumber(p_GetCoeff(p, oldRing), par_perm, OldPar, oldRing, dst);
+
+      p_Test(aq, dst);
        
       if ( (!rMinpolyIsNULL(dst)) && (rField_is_Zp_a(dst) || rField_is_Q_a(dst)) )
@@ -3343 +3437 @@
         p_Normalize(aq,dst);
          
-        if (aq==NULL)
-          p_SetCoeff(qq, n_Init(0,dst->cf),dst);
-      }
+      }
+      if (aq == NULL)
+        p_SetCoeff(qq, n_Init(0, dst->cf),dst); // Very dirty trick!!!
+         
       p_Test(aq, dst);
     }
@@ -3389 +3484 @@
               const int par = -perm[i];
               assume( par > 0 );
+
 //              WarnS("longalg missing 3");
 #if 1
@@ -3448 +3544 @@
     }
     pIter(p);
+     
+#if 0
+    p_Test(aq,dst);
+    PrintS("\naq: "); p_Write(aq, dst, dst); PrintLn();
+#endif
+     
 
 #if 1
@@ -3453 +3555 @@
     {
       p_Setm(qq,dst);
+       
       p_Test(aq,dst);
       p_Test(qq,dst);
-      if (aq!=NULL) qq=p_Mult_q(aq,qq,dst);
+       
+#if 0
+    p_Test(qq,dst);
+    PrintS("\nqq: "); p_Write(qq, dst, dst); PrintLn();
+#endif
+       
+      if (aq!=NULL) 
+         qq=p_Mult_q(aq,qq,dst);
+       
       aq = qq;
+       
       while (pNext(aq) != NULL) pIter(aq);
+       
       if (result_last==NULL)
       {
@@ -3474 +3587 @@
     }
   }
+   
   result=p_SortAdd(result,dst);
 #else
@@ -3504 +3618 @@
 #endif
   p_Test(result,dst);
+   
+#if 0
+  p_Test(result,dst);
+  PrintS("\nresult: "); p_Write(result,dst,dst); PrintLn();
+#endif
   return result;
 }

libpolys/polys/monomials/p_polys.h

@@ -1910 +1910 @@
 poly p_JetW(poly p, int m, short *w, const ring R);
 
-
-poly      p_PermPoly (poly p, int * perm,const ring OldRing, const ring dst,
-                     nMapFunc nMap, int *par_perm=NULL, int OldPar=0);
+poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst);
+
+poly p_PermPoly (poly p, const int * perm,const ring OldRing, const ring dst,
+                     nMapFunc nMap, const int *par_perm=NULL, int OldPar=0);
 
 /*----------------------------------------------------*/