Changeset 9b1bb5c in git

Timestamp:

Aug 15, 2018, 3:33:58 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

77b7a1075c63d0b12c707b6a719240d2b2fdf345

Parents:

0334da7d689c072c3ddd2bbfd0e14565f43da2d6

Message:

simplify transext.cc

File:

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

libpolys/polys/ext_fields/transext.cc

@@ -61 +61 @@
 #define ADD_COMPLEXITY 1   /**< complexity increase due to + and - */
 #define MULT_COMPLEXITY 2   /**< complexity increase due to * and / */
-#define DIFF_COMPLEXITY 2   /**< complexity increase due to * and / */
+#define DIFF_COMPLEXITY 2   /**< complexity increase due to diff */
 #define BOUND_COMPLEXITY 10   /**< maximum complexity of a number */
 
@@ -1063 +1063 @@
     if(da == NULL)
     { // both fa && fb are ?? // NULL!
-      assume (da == NULL && db == NULL);
       DEN(result) = NULL;
       COM(result) = 0;
+      p_Normalize(g,ntRing);
     }
     else
     {
-      assume (da != NULL && db == NULL);
       DEN(result) = p_Copy(da, ntRing);
       COM(result) = COM(fa) + MULT_COMPLEXITY;
@@ -1080 +1079 @@
     if (da == NULL)
     { // a == ? // NULL
-      assume( db != NULL && da == NULL);
       DEN(result) = p_Copy(db, ntRing);
       COM(result) = COM(fb) + MULT_COMPLEXITY;
@@ -1088 +1086 @@
     else /* both den's are != 1 */
     {
-      assume (da != NULL && db != NULL);
       DEN(result) = pp_Mult_qq(da, db, ntRing);
       COM(result) = COM(fa) + COM(fb) + MULT_COMPLEXITY;