Changeset d76b58 in git

Timestamp:

Apr 3, 2007, 5:16:39 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

9d7c017a79e5d3272ee273750210ac7b1d3b368b

Parents:

f07b7f501de2ad2471b3ede6892f65e8bed16c5b

Message:

*hannes: AIX-5 port


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

Files:

• MP/MPT/MPT_GP.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (3 diffs)
• kernel/polys1.cc (modified) (4 diffs)
• kernel/tgb.cc (modified) (2 diffs)

MP/MPT/MPT_GP.cc

@@ -490 +490 @@
     MPT_GP_DistMvPoly_t(tnode, coeffs, nvars,
                         MPT_GetGP_Ordering(
-                          (MPT_Node_t*)MPT_AnnotValue(tnode,
+                          (MPT_Tree_pt)MPT_AnnotValue(tnode,
                                          MP_PolyDict,
                                          MP_AnnotPolyOrdering), 
                           nvars), 
                         MPT_GetGP_Ordering(
-                          (MPT_Node_t*)MPT_AnnotValue(tnode,
+                          (MPT_Tree_pt)MPT_AnnotValue(tnode,
                                          MP_PolyDict,
                                          MP_AnnotShouldHavePolyOrdering),

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.40 2007-03-02 09:25:56 Singular Exp $ */
+/* $Id: ideals.cc,v 1.41 2007-04-03 15:16:39 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2369 +2369 @@
   if (rIsPluralRing(currRing))
   {
-    BOOLEAN BAD = FALSE;
+    BOOLEAN bBAD = FALSE;
     if ( nc_rComplete(origR, &tmpR) )
     {
       Werror("error in nc_rComplete");
-      BAD = TRUE;
-    }
-    if (!BAD)
+      bBAD = TRUE;
+    }
+    if (!bBAD)
     {
       /* tests the admissibility of the new elim. ordering */
@@ -2381 +2381 @@
       {
         Werror("no elimination is possible: ordering condition is violated");
-        BAD = TRUE;
-      }
-    }
-    if (BAD)
+        bBAD = TRUE;
+      }
+    }
+    if (bBAD)
     {
       // cleanup

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.24 2007-03-20 13:03:08 Singular Exp $ */
+/* $Id: polys1.cc,v 1.25 2007-04-03 15:16:39 Singular Exp $ */
 
 /*
@@ -570 +570 @@
     if (rField_is_Q_a())
     {
-      number hz = nlInit(1);
+      number hzz = nlInit(1);
       h = nlInit(1);
       p=ph;
@@ -579 +579 @@
         while (c_n!=NULL)
         { // each monom: coeff in Q
-          d=nlLcm(hz,pGetCoeff(c_n),currRing->algring);
-          n_Delete(&hz,currRing->algring);
-          hz=d;
+          d=nlLcm(hzz,pGetCoeff(c_n),currRing->algring);
+          n_Delete(&hzz,currRing->algring);
+          hzz=d;
           pIter(c_n);
         }
@@ -594 +594 @@
         pIter(p);
       }
-      /* hz contains the 1/lcm of all denominators in c_n_n->z*/
+      /* hzz contains the 1/lcm of all denominators in c_n_n->z*/
       /* h contains the 1/lcm of all denominators in c_n_n->n*/
       number htmp=nlInvers(h);
-      number hztmp=nlInvers(hz);
-      number hh=nlMult(hz,h);
-      nlDelete(&hz,currRing->algring);
+      number hzztmp=nlInvers(hzz);
+      number hh=nlMult(hzz,h);
+      nlDelete(&hzz,currRing->algring);
       nlDelete(&h,currRing->algring);
-      number hg=nlGcd(hztmp,htmp,currRing->algring);
-      nlDelete(&hztmp,currRing->algring);
+      number hg=nlGcd(hzztmp,htmp,currRing->algring);
+      nlDelete(&hzztmp,currRing->algring);
       nlDelete(&htmp,currRing->algring);
       h=nlMult(hh,hg);

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.150 2007-02-23 13:17:54 bricken Exp $ */
+/* $Id: tgb.cc,v 1.151 2007-04-03 15:16:39 Singular Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2812 +2812 @@
   is_homog=TRUE;
   {
-    int hz;
-    for(hz=0;hz<IDELEMS(I);hz++){
-      assume(I->m[hz]!=NULL);
-      int d=pTotaldegree(I->m[hz]);
-      poly t=I->m[hz]->next;
+    int hzz;
+    for(hzz=0;hzz<IDELEMS(I);hzz++){
+      assume(I->m[hzz]!=NULL);
+      int d=pTotaldegree(I->m[hzz]);
+      poly t=I->m[hzz]->next;
       while(t)
       {