Changeset 680ca3e in git for libpolys/polys/ext_fields/algext.cc

Timestamp:

Feb 21, 2013, 3:20:06 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f48707971b394befdb9c3fce8f6366610b334e92

Parents:

dd290f48322737d7fcc47f0fb8ea2059467097c07600fb155db01a25b5e1a80b4394e4ff39585f53

Message:

Merge pull request #292 from mmklee/imap

chg: extended naCopyTrans2AlgExt

File:

• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -926 +926 @@
   assume (nCoeff_is_algExt (dst));
   fraction fa=(fraction)a;
-  assume( rSamePolyRep(src->extRing, dst->extRing) );
-  poly p = p_Copy(NUM(fa),src->extRing);
+  poly p, q;
+  if (rSamePolyRep(src->extRing, dst->extRing))
+  {
+    p = p_Copy(NUM(fa),src->extRing);
+    if (!DENIS1(fa))
+    {
+      q = p_Copy(DEN(fa),src->extRing);
+      assume (q != NULL);
+    }
+  }
+  else
+  {
+    assume ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)));
+
+    nMapFunc nMap= n_SetMap (src->extRing->cf, dst->extRing->cf);
+
+    assume (nMap != NULL);
+    p= p_PermPoly (NUM (fa), NULL, src->extRing, dst->extRing,nMap, NULL,rVar (src->extRing));
+    if (!DENIS1(fa))
+    {
+      q= p_PermPoly (DEN (fa), NULL, src->extRing, dst->extRing,nMap, NULL,rVar (src->extRing));
+      assume (q != NULL);
+    }
+  }
   definiteReduce(p, dst->extRing->qideal->m[0], dst);
   assume (p_Test (p, dst->extRing));
-  return (number)p;
+  if (!DENIS1(fa))
+  {
+    definiteReduce(q, dst->extRing->qideal->m[0], dst);
+    assume (p_Test (q, dst->extRing));
+    if (q != NULL)
+    {
+      number t= naDiv ((number)p,(number)q, dst);
+      p_Delete (&p, dst->extRing);
+      p_Delete (&q, dst->extRing);
+      return t;
+    }
+    WerrorS ("mapping denominator to zero");
+  }
+  return (number) p;
 }
 
@@ -1021 +1056 @@
          return naCopyTrans2AlgExt;
     }
-    else
-      return NULL;                               /// Z/p(b) --> Z/p(a)
+    else if ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)))
+    {
+      if (src->type==n_transExt)
+        return naCopyTrans2AlgExt;
+    }
   }