Changeset e710e2 in git

Timestamp:

Apr 29, 2005, 7:35:18 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3175d17ec57bce508d17c4edf42f0152212f42cc

Parents:

53f676a223a33b24506039cdeca5266e23611a25

Message:

*hannes: code cleanup


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

Location:

kernel

Files:

• fglmzero.cc (modified) (2 diffs)
• ring.cc (modified) (4 diffs)

kernel/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.2 2004-06-23 15:12:24 Singular Exp $
+// $Id: fglmzero.cc,v 1.3 2005-04-29 17:35:17 Singular Exp $
 
 /****************************************
@@ -1102 +1102 @@
     intvec *iv = idSort(perm,TRUE);
     idDelete(&perm);
-    for(int i = pVariables; i > 0; i--) varpermutation[pVariables+1-i] = (*iv)[i-1];
+    for(i = pVariables; i > 0; i--) varpermutation[pVariables+1-i] = (*iv)[i-1];
     delete iv;
      
-    for ( i= 1; i <= pVariables; i++ ) {
+    for (i= 1; i <= pVariables; i++ )
+    {
         // main loop
         STICKYPROT2( "(%i)", i /*varpermutation[i]*/);

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.33 2005-04-22 18:09:42 levandov Exp $ */
+/* $Id: ring.cc,v 1.34 2005-04-29 17:35:18 Singular Exp $ */
 
 /*
@@ -1238 +1238 @@
     nMapFunc nMap1 = nSetMap(r1);
     Q1 = idInit(IDELEMS(r1->qideal),1);
-    for (int i=0;i<IDELEMS(r1->qideal);i++)
-      Q1->m[i] = pPermPoly(r1->qideal->m[i],perm1,r1,nMap1,par_perm1,rPar(r1));
+    for (int for_i=0;for_i<IDELEMS(r1->qideal);for_i++)
+      Q1->m[for_i] = pPermPoly(r1->qideal->m[for_i],perm1,r1,nMap1,par_perm1,rPar(r1));
     omFree((ADDRESS)perm1);
   }
@@ -1257 +1257 @@
     nMapFunc nMap2 = nSetMap(r2);
     Q2 = idInit(IDELEMS(r2->qideal),1);
-    for (int i=0;i<IDELEMS(r2->qideal);i++)
-      Q2->m[i] = pPermPoly(r2->qideal->m[i],perm2,r2,nMap2,par_perm2,rPar(r2));
+    for (int for_i=0;for_i<IDELEMS(r2->qideal);for_i++)
+      Q2->m[for_i] = pPermPoly(r2->qideal->m[for_i],perm2,r2,nMap2,par_perm2,rPar(r2));
     omFree((ADDRESS)perm2);
   }
@@ -2244 +2244 @@
   /*weights: entries for 3 blocks: NULL*/
   res->wvhdl = (int **)omAlloc0(3 * sizeof(int_ptr));
-  /*order: dp,C,0*/
+  /*order: Wp,C,0*/
   res->order = (int *) omAlloc(3 * sizeof(int *));
   res->block0 = (int *)omAlloc0(3 * sizeof(int *));
   res->block1 = (int *)omAlloc0(3 * sizeof(int *));
-  /* ringorder dp for the first block: var 1..3 */
+  /* ringorder Wp for the first block: var 1..r->N */
   res->order[0]  = ringorder_Wp;
   res->block0[0] = 1;