Changeset 9f9dd4 in git

Timestamp:

Apr 30, 2013, 2:24:21 AM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

45d13f19037a5f9678287dd9d3ee1791a9a3eded

Parents:

ccb904bb634d071cbadd5d11141c512313839b46ec08e4a380cdd364bfcec2186fb3f303e2c825fa

Message:

Merge pull request #323 from mschulze/spielwiese

fixed problem in Makefile.am caused by Debian changes

Files:

• Makefile.am (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (5 diffs)

Makefile.am

@@ -37 +37 @@
         debian/copyright \
         debian/rules \
-        debian/singular.dirs \
+        debian/singular-bin.install \
+        debian/singular-common.dirs \
+        debian/singular-common.install \
+        debian/singular-dev.install \
         debian/source/format \
         debian/source/include-binaries \

libpolys/polys/ext_fields/transext.cc

@@ -183 +183 @@
       number n=pGetCoeff(p);
       n_Test(n,ntCoeffs);
+      if ((!(SR_HDL(n) & SR_INT))&&(n->s==0))
+      /* not normalized, just do for the following test*/
+      {
+        n_Normalize(pGetCoeff(p),ntCoeffs);
+        n=pGetCoeff(p);
+      }
       if (!(SR_HDL(n) & SR_INT))
       {
@@ -988 +994 @@
        then both the numerator and the denominator will be divided by the
        GCD of the a_alpha's and the c_beta's (if this GCD is != 1),
-   (3) if 'a' is - e.g. after having performed steps (1) and (2) - of the
-       form
-          (sum_alpha a_alpha * t^alpha)
-          -----------------------------
-                        c
-       with integers a_alpha, and c != 1, then 'a' will be replaced by
-       (sum_alpha a_alpha/c * t^alpha);
    this procedure does not alter COM(f) (this has to be done by the
    calling procedure);
@@ -1004 +1003 @@
   assume(!DENIS1(f));
 
-  if (!p_IsConstant(DEN(f), ntRing))
   { /* step (1); see documentation of this procedure above */
     p_Normalize(NUM(f), ntRing);
@@ -1038 +1036 @@
     }
     n_Delete(&lcmOfDenominators, ntCoeffs);
-    if (!p_IsConstant(DEN(f), ntRing))
+    if (DEN(f)!=NULL)
     { /* step (2); see documentation of this procedure above */
       p = NUM(f);
@@ -1072 +1070 @@
       n_Delete(&gcdOfCoefficients, ntCoeffs);
     }
-  }
-  if (p_IsConstant(DEN(f), ntRing) &&
-      (!n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs)))
-  { /* step (3); see documentation of this procedure above */
-    number inverseOfDen = n_Invers(p_GetCoeff(DEN(f), ntRing), ntCoeffs);
-    NUM(f) = p_Mult_nn(NUM(f), inverseOfDen, ntRing);
-    n_Delete(&inverseOfDen, ntCoeffs);
-    p_Delete(&DEN(f), ntRing);
-    DEN(f) = NULL;
   }