Changeset 07ff96 in git for libpolys/polys/ext_fields

Timestamp:

Dec 5, 2012, 3:28:19 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

0145f469b68cb4ac35da3518ae5cb1464fbc85a4a07784ce2c96d788165ee1c5046e4e2f60bec8e3f659855c746f8978e0386f9dc2f9d9ecfc3d73b2

Parents:

80d7722e6833c629fe2c07881a5d23b7c4a9b4e4

Message:

optim. multiplication/equality test for algext.cc

File:

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

libpolys/polys/ext_fields/algext.cc

@@ -299 +299 @@
 {
   naTest(a); naTest(b);
-
   /// simple tests
-  if (a == b) return TRUE;
-  if ((a == NULL) && (b != NULL)) return FALSE;
-  if ((b == NULL) && (a != NULL)) return FALSE;
-
-  /// deg test
-  int aDeg = 0;
-  if (a != NULL) aDeg = p_Totaldegree((poly)a, naRing);
-  int bDeg = 0;
-  if (b != NULL) bDeg = p_Totaldegree((poly)b, naRing);
-  if (aDeg != bDeg) return FALSE;
-
-  /// subtraction test
-  number c = naSub(a, b, cf);
-  BOOLEAN result = naIsZero(c, cf);
-  naDelete(&c, cf);
-  return result;
+  if (a == NULL) return (b == NULL);
+  if (b == NULL) return (a == NULL);
+  return p_EqualPolys((poly)a,(poly)b,naRing);
 }
 
@@ -516 +502 @@
 {
   naTest(a); naTest(b);
-  if (a == NULL) return NULL;
-  if (b == NULL) return NULL;
+  if ((a == NULL)||(b == NULL)) return NULL;
   poly aTimesB = p_Mult_q(p_Copy((poly)a, naRing),
                           p_Copy((poly)b, naRing), naRing);
+  p_Normalize(aTimesB,naRing);
   definiteReduce(aTimesB, naMinpoly, cf);
   return (number)aTimesB;