Changeset 1e8006 in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Sep 3, 2013, 5:34:18 PM (10 years ago)

Author:

Janko Boehm <boehm@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

fde4e42d36b6b8f24447bcbe2975e9d91dd95f13

Parents:

a57b655308776d26d2a30d610451d0b7955cf233

git-author:

Janko Boehm <boehm@mathematik.uni-kl.de>2013-09-03 17:34:18+02:00

git-committer:

Janko Boehm <boehm@mathematik.uni-kl.de>2013-09-03 19:36:12+02:00

Message:

Changes to ntDiff

File:

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

libpolys/polys/ext_fields/transext.cc

@@ -768 +768 @@
 
   fraction fa = (fraction)a;
-
-  poly g = p_Copy(NUM(fa), ntRing);
-  poly f = p_Copy(DEN(fa), ntRing);
-  poly dg =p_Diff(g,k,ntRing);
   if (DENIS1(fa)) {
 
      fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-     NUM(result) = dg;
+     NUM(result) = p_Diff(NUM(fa),k,ntRing);
      DEN(result) = NULL;
      COM(result) = COM(fa);
@@ -781 +777 @@
   }
 
-  poly df =p_Diff(f,k,ntRing);
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  poly fg = p_Mult_q(p_Copy(f,ntRing),dg,ntRing);
-  poly gf = p_Neg(p_Mult_q(g,df,ntRing),ntRing);
-  NUM(result) = p_Add_q(fg,gf,ntRing);
-  DEN(result) = p_Mult_q(p_Copy(f,ntRing), f, ntRing);
+  poly fg = p_Mult_q(p_Copy(DEN(fa),ntRing),p_Diff(NUM(fa),k,ntRing),ntRing);
+  poly gf = p_Mult_q(p_Copy(NUM(fa),ntRing),p_Diff(DEN(fa),k,ntRing),ntRing);
+  NUM(result) = p_Sub(fg,gf,ntRing);
+  if (NUM(result)==NULL) return(NULL);
+  DEN(result) = pp_Mult_qq(DEN(fa), DEN(fa), ntRing);
   COM(result) = COM(fa) + COM(fa) + DIFF_COMPLEXITY;
-  if (NUM(result)==NULL) return(NULL);
   heuristicGcdCancellation((number)result, cf);