Changeset 52cc7a4 in git

Timestamp:

Aug 18, 2008, 2:26:02 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6d898347af76d4482a05fd199bfbad769f001a03

Parents:

da2fc8d3786d00597bd91e3c2d5c1488846cb301

Message:

*hannes: code cleanup


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

Files:

• Singular/wrapper.cc (modified) (2 diffs)
• kernel/sca.cc (modified) (4 diffs)
• kernel/structs.h (modified) (3 diffs)
• kernel/tgb.cc (modified) (4 diffs)

Singular/wrapper.cc

@@ -31 +31 @@
   T->root=NULL;
 
-  for (int i=0; i < v->idelems(); i++)
+  for (int i=0; i < IDELEMS(v); i++)
   {
     if (v->m[i]!=NULL)
@@ -60 +60 @@
   ideal I=(ideal)v->Data();
   BOOLEAN is_zero=TRUE;
-  for (int i=0; i < I->idelems(); i++)
+  for (int i=0; i < IDELEMS(I); i++)
   {
     if ((I->m[i]!=NULL)&& (pIsConstant(I->m[i])))

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.27 2008-07-26 14:28:03 motsak Exp $
+ *  Version: $Id: sca.cc,v 1.28 2008-08-18 12:25:35 Singular Exp $
  *******************************************************************/
 
@@ -2700 +2700 @@
   assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
 
-  const int iSize = id->idelems();
+  const int iSize = IDELEMS(id);
 
   if (iSize == 0) return id;
@@ -2710 +2710 @@
   {
     Print("ideal id: \n");
-    for (int i = 0; i < id->idelems(); i++)
+    for (int i = 0; i < IDELEMS(id); i++)
     {
       Print("; id[%d] = ", i+1);
@@ -2730 +2730 @@
   {
     Print("ideal temp: \n");
-    for (int i = 0; i < temp->idelems(); i++)
+    for (int i = 0; i < IDELEMS(temp); i++)
     {
       Print("; temp[%d] = ", i+1);

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.54 2008-08-18 10:39:57 Singular Exp $ */
+/* $Id: structs.h,v 1.55 2008-08-18 12:25:35 Singular Exp $ */
 /*
 * ABSTRACT
@@ -697 +697 @@
   int ncols;
   #define IDELEMS(i) ((i)->ncols)
-  inline int& idelems(void) { return ncols; }
 };
 
@@ -771 +770 @@
 
 #if defined(__cplusplus)
-inline int si_max(const int a, const int b)  { return (a>b) ? a : b; }
-inline int si_min(const int a, const int b)  { return (a<b) ? a : b; }
-inline long si_max(const long a, const long b)  { return (a>b) ? a : b; }
-inline long si_min(const long a, const long b)  { return (a<b) ? a : b; }
+static inline int si_max(const int a, const int b)  { return (a>b) ? a : b; }
+static inline int si_min(const int a, const int b)  { return (a<b) ? a : b; }
+static inline long si_max(const long a, const long b)  { return (a>b) ? a : b; }
+static inline long si_min(const long a, const long b)  { return (a<b) ? a : b; }
 #else
 #define si_max(A,B) ((A) > (B) ? (A) : (B))

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.157 2008-06-27 12:10:58 bricken Exp $ */
+/* $Id: tgb.cc,v 1.158 2008-08-18 12:25:35 Singular Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2901 +2901 @@
   current_degree=1;
 
-  max_pairs=5*I->idelems();
+  max_pairs=5*IDELEMS(I);
 
   apairs=(sorted_pair_node**) omalloc(sizeof(sorted_pair_node*)*max_pairs);
   pair_top=-1;
 
-  int n=I->idelems();
+  int n=IDELEMS(I);
   array_lengths=n;
 
@@ -2973 +2973 @@
   add_to_basis_ideal_quotient(I->m[0],this,NULL);
 
-  assume(strat->sl==strat->Shdl->idelems()-1);
+  assume(strat->sl==IDELEMS(strat->Shdl)-1);
   if(!(F4_mode))
   {
@@ -3003 +3003 @@
       add_to_basis_ideal_quotient(I->m[i],this,NULL);
   }
-  for(i=0;i<I->idelems();i++)
+  for(i=0;i<IDELEMS(I);i++)
   {
     I->m[i]=NULL;