Changeset f52924 in git

Timestamp:

Feb 26, 2007, 12:43:07 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

89e45baf4d2e90881d5361455ba0740b56975eb7

Parents:

8120f8d31249d952812c48928a245fe445f5abd1

Message:

*hannes: naNormalize again


git-svn-id: file:///usr/local/Singular/svn/trunk@9900 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/longalg.cc (modified) (4 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.24 2007-02-22 14:52:40 Singular Exp $ */
+/* $Id: longalg.cc,v 1.25 2007-02-26 11:43:07 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -66 +66 @@
 static int napExpi(int i, napoly a, napoly b);
 static ring nacRing;
-#define NA_NORMALIZE_CNT 3
+#define NA_NORMALIZE_CNT 5
 static inline void naNormalize0(number &pp)
 {
@@ -73 +73 @@
   {
     p->cnt++;
-    if (p->cnt>NA_NORMALIZE_CNT) naNormalize(pp);
+    if ((p->cnt>NA_NORMALIZE_CNT)
+    //|| (currRing->minpoly!=NULL)
+    //|| ((p->n!=NULL) && (p->cnt>1))
+    )
+      naNormalize(pp);
   }
 }
@@ -1278 +1282 @@
     lo->s = 0;
     number luu=(number)lo;
-    naNormalize0(luu);
+    naNormalize(luu);
     lo=(lnumber)luu;
   }