Changeset 8fa1c2 in git

Timestamp:

Jan 30, 2007, 10:30:16 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

39c40f9402956fa6907f5f3f869d9402506f6a9b

Parents:

e014ab39e9c9d69c1d418be693f8a61dbe474598

Message:

*hannes: optim, ->s


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

File:

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

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.20 2007-01-29 16:57:59 Singular Exp $ */
+/* $Id: longalg.cc,v 1.21 2007-01-30 09:30:16 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -1050 +1050 @@
   lnumber a = (lnumber)la;
   lnumber b = (lnumber)lb;
-  if (a->n !=NULL) naNormalize(la);
-  if (b->n !=NULL) naNormalize(lb);
-
 
   omCheckAddrSize(a,sizeof(snumber));
@@ -1156 +1153 @@
     napDelete(&x);
   lo->n = x;
-  lo->s = 0;
   if(lo->z==NULL)
   {
@@ -1165 +1161 @@
   else if (lo->n!=NULL)
   {
+    lo->s = 0;
     number luu=(number)lo;
     naNormalize(luu);
@@ -1170 +1167 @@
   }
   else
-    lo->s=2;
+    lo->s=3;
 #endif
   naTest((number)lo);
@@ -1255 +1252 @@
   if ((napIsConstant(x)) && nacIsOne(napGetCoeff(x)))
     napDelete(&x);
-  lo->s = 0;
   lo->n = x;
   if (lo->n!=NULL)
   {
-     number luu=(number)lo;
-     naNormalize(luu);
-     lo=(lnumber)luu;
-  }
+    lo->s = 0;
+    number luu=(number)lo;
+    naNormalize(luu);
+    lo=(lnumber)luu;
+  }
+  else
+    lo->s=3;
   naTest((number)lo);
   return (number)lo;
@@ -1662 +1661 @@
 *   univariate polynomials, always use Factory
 */
+//#define FACTORY_GCD_TEST
 void naNormalize(number &pp)
 {
@@ -1709 +1709 @@
     }
     y = p->n;
-  }
   // p->n !=NULL:
   /* collect all denoms from y and multiply x and y by it */
-  if (naIsChar0)
-  {
     number n=napLcm(y);
     napMultN(x,n);
@@ -1731 +1728 @@
     y = p->n;
   }
-  if (naMinimalPoly == NULL)
+  if ((naMinimalPoly == NULL) && (x!=NULL) && (y!=NULL))
   {
     int i;