Changeset 5523765 in git

Timestamp:

Feb 21, 2013, 11:23:56 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7600fb155db01a25b5e1a80b4394e4ff39585f53

Parents:

507427e9e0bf212d166ab8f3bb970f562784a172

git-author:

Martin Lee <martinlee84@web.de>2013-02-21 11:23:56+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-21 14:38:49+01:00

Message:

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);
+  if (!DENIS1 (fa))
+    WarnS ("ignoring denominators in naCopyTrans2AlgExt");
+  poly p;
+  if (rSamePolyRep(src->extRing, dst->extRing))
+  {
+    p = p_Copy(NUM(fa),src->extRing);
+  }
+  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));
+  }
   definiteReduce(p, dst->extRing->qideal->m[0], dst);
   assume (p_Test (p, dst->extRing));
@@ -1021 +1035 @@
          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;
+    }
   }