Changeset 44fac1 in git for kernel

Timestamp:

Feb 5, 2013, 2:54:42 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

07df916e240f5e814e41624e08e7dac0bc26fcb5

Parents:

8436eb4f6569b8028c52e48106505001a3771c6b

Message:

fix: omalloc -> omAlloc

from master

Location:

kernel

Files:

• tgb.cc (modified) (14 diffs)
• tgb_internal.h (modified) (11 diffs)
• tgbgauss.cc (modified) (9 diffs)

kernel/tgb.cc

@@ -912 +912 @@
     {
       now_t_rep (i, j, c);
-      omfree (i_con);
+      omFree (i_con);
       return TRUE;
     }
@@ -1120 +1120 @@
 {
   ideal I = c->S;
-  int *cans = (int *) omalloc (c->n * sizeof (int));
-  int *connected = (int *) omalloc (c->n * sizeof (int));
+  int *cans = (int *) omAlloc (c->n * sizeof (int));
+  int *connected = (int *) omAlloc (c->n * sizeof (int));
   cans[0] = to;
   int cans_length = 1;
@@ -1158 +1158 @@
               connected[connected_length] = -1;
             }
-            omfree (cans);
+            omFree (cans);
             return connected;
           }
@@ -1204 +1204 @@
               connected[connected_length] = -1;
             }
-            omfree (cans);
+            omFree (cans);
             return connected;
           }
@@ -1249 +1249 @@
     {
       now_t_rep (i, j, c);
-      omfree (i_con);
+      omFree (i_con);
       p_Delete (&lm, c->r);
       return;
@@ -1513 +1513 @@
   c->tmp_pair_lm[i] = pOne_Special (c->r);
 
-  c->tmp_spn[i] = (sorted_pair_node *) omalloc (sizeof (sorted_pair_node));
+  c->tmp_spn[i] = (sorted_pair_node *) omAlloc (sizeof (sorted_pair_node));
 
   c->lengths[i] = pLength (h);
@@ -1540 +1540 @@
 #else
   if(i > 0)
-    c->states[i] = (char *) omalloc (i * sizeof (char));
+    c->states[i] = (char *) omAlloc (i * sizeof (char));
   else
     c->states[i] = NULL;
@@ -1749 +1749 @@
               __p_GetComp (c->S->m[nodes[lower]->j], c->r));
       nodes_final[spc_final] =
-        (sorted_pair_node *) omalloc (sizeof (sorted_pair_node));
+        (sorted_pair_node *) omAlloc (sizeof (sorted_pair_node));
 
       *(nodes_final[spc_final++]) = *(nodes[lower]);
@@ -1768 +1768 @@
 
   assume (spc_final <= spc);
-  omfree (nodes);
+  omFree (nodes);
   nodes = NULL;
 
@@ -1823 +1823 @@
       c->introduceDelayedPairs (array_arg, j);
 
-      omfree (array_arg);       // !!!
+      omFree (array_arg);       // !!!
     }
 //     PrintS("Saturation - done!!!\n");
@@ -1840 +1840 @@
     c->pair_top += spc_final;
     clean_top_of_pair_list (c);
-    omfree (nodes_final);
+    omFree (nodes_final);
     return NULL;
   }
@@ -2215 +2215 @@
     memmove (big_sbuf + partsum, sbuf[j],
              ibuf[j] * sizeof (sorted_pair_node *));
-    omfree (sbuf[j]);
+    omFree (sbuf[j]);
     partsum += ibuf[j];
   }
@@ -2223 +2223 @@
   c->pair_top += sum;
   clean_top_of_pair_list (c);
-  omfree (big_sbuf);
+  omFree (big_sbuf);
   omfree (sbuf);
   omfree (ibuf);
@@ -2243 +2243 @@
   //after that can evaluate placeholders
   int i;
-  buffer = (number *) omalloc (nIrreducibleMonomials * sizeof (number));
+  buffer = (number *) omAlloc (nIrreducibleMonomials * sizeof (number));
   for(i = 0; i < root.branches_len; i++)
   {
     evaluateRows (1, root.branches[i]);
   }
-  omfree (buffer);
+  omFree (buffer);
   buffer = NULL;
 }

kernel/tgb_internal.h

@@ -540 +540 @@
   {
     len=n;
-    idx_array=(int*) omalloc(n*sizeof(int));
-    coef_array=(number_type*) omalloc(n*sizeof(number_type));
+    idx_array=(int*) omAlloc(n*sizeof(int));
+    coef_array=(number_type*) omAlloc(n*sizeof(number_type));
   }
   SparseRow<number_type>(int n, const number_type* source)
@@ -547 +547 @@
     len=n;
     idx_array=NULL;
-    coef_array=(number_type*) omalloc(n*sizeof(number_type));
+    coef_array=(number_type*) omAlloc(n*sizeof(number_type));
     memcpy(coef_array,source,n*sizeof(number_type));
   }
@@ -686 +686 @@
     {
       tempBufferSize=2*size;
-      omfree(tempBuffer);
+      omFree(tempBuffer);
       tempBuffer=omAlloc(tempBufferSize);
     }
@@ -714 +714 @@
     omfree(recursionPolyBuffer);
 #endif
-   omfree(tempBuffer);
+   omFree(tempBuffer);
   }
 
@@ -1648 +1648 @@
     lastReducibleIndices=(int*) omalloc(nrows*sizeof(int));
     nonZeroUntil=0;
-    while(nonZeroUntil<nrows){
-      if (startIndices[nonZeroUntil]<ncols){
-
+    while(nonZeroUntil<nrows)
+    {
+      if (startIndices[nonZeroUntil]<ncols)
+      {
         nonZeroUntil++;
       }
@@ -1759 +1760 @@
   //Print("Input rows %d\n",pn);
   int j;
-  if (TEST_OPT_PROT){
+  if (TEST_OPT_PROT)
+  {
     Print("Input rows %d\n",pn);
   }
@@ -1765 +1767 @@
   NoroCache<number_type> cache;
 
-  SparseRow<number_type> ** srows=(SparseRow<number_type>**) omalloc(pn*sizeof(SparseRow<number_type>*));
+  SparseRow<number_type> ** srows=(SparseRow<number_type>**) omAlloc(pn*sizeof(SparseRow<number_type>*));
   int non_zeros=0;
-  for(j=0;j<pn;j++){
-
+  for(j=0;j<pn;j++)
+  {
     poly h=p[j];
     int h_len=pLength(h);
-
     //number coef;
-
-
     srows[non_zeros]=noro_red_to_non_poly_t<number_type>(h,h_len,&cache,c);
     if (srows[non_zeros]!=NULL) non_zeros++;
@@ -1784 +1783 @@
   int n=irr_nodes.size();//cache.countIrreducibleMonomials();
   cache.nIrreducibleMonomials=n;
-  if (TEST_OPT_PROT){
+  if (TEST_OPT_PROT)
+  {
     Print("Irred Mon:%d\n",n);
     Print("red Mon:%d\n",cache.nReducibleMonomials);
@@ -1790 +1790 @@
   TermNoroDataNode<number_type>* term_nodes=(TermNoroDataNode<number_type>*) omalloc(n*sizeof(TermNoroDataNode<number_type>));
 
-  for(j=0;j<n;j++){
+  for(j=0;j<n;j++)
+  {
     assume(irr_nodes[j]!=NULL);
     assume(irr_nodes[j]->value_len==NoroCache<number_type>::backLinkCode);
@@ -1798 +1799 @@
   }
 
-
   qsort(term_nodes,n,sizeof(TermNoroDataNode<number_type>),term_nodes_sort_crit<number_type>);
   poly* terms=(poly*) omalloc(n*sizeof(poly));
@@ -1813 +1813 @@
   //  Print("Evaluate Rows \n");
   pn=non_zeros;
-  number_type* number_array=(number_type*) omalloc(n*pn*sizeof(number_type));
-  memset(number_array,0,sizeof(number_type)*n*pn);
+  number_type* number_array=(number_type*) omalloc0(n*pn*sizeof(number_type));
 
   for(j=0;j<pn;j++)

kernel/tgbgauss.cc

@@ -128 +128 @@
 {
   int col, row;
-  int* row_cache=(int*) omalloc(mat->get_rows()*sizeof(int));
+  int* row_cache=(int*) omAlloc(mat->get_rows()*sizeof(int));
   col=0;
   row=0;
@@ -134 +134 @@
   int pn=mat->get_rows();
   int matcol=mat->get_columns();
-  int* area=(int*) omalloc(sizeof(int)*((matcol-1)/bundle_size+1));
+  int* area=(int*) omAlloc(sizeof(int)*((matcol-1)/bundle_size+1));
   const int max_area_index=(matcol-1)/bundle_size;
     //rows are divided in areas
@@ -359 +359 @@
     row++;
   }
-  omfree(area);
-  omfree(row_cache);
+  omFree(area);
+  omFree(row_cache);
 }
 
@@ -458 +458 @@
 tgb_matrix::tgb_matrix(int i, int j)
 {
-  n=(number**) omalloc(i*sizeof (number*));;
+  n=(number**) omAlloc(i*sizeof (number*));;
   int z;
   int z2;
   for(z=0;z<i;z++)
   {
-    n[z]=(number*)omalloc(j*sizeof(number));
+    n[z]=(number*)omAlloc(j*sizeof(number));
     for(z2=0;z2<j;z2++)
     {
@@ -489 +489 @@
         }
       }
-      omfree(n[z]);
+      omFree(n[z]);
     }
   }
@@ -507 +507 @@
       StringSetS("");
       n_Write(n[i][j],currRing);
-      char *s=StringEndS(); PrintS(s); omFree(s);
+      char *s=StringEndS();
+      PrintS(s);
+      omFree(s);
       PrintS("\t");
     }
@@ -636 +638 @@
     if((free_non_zeros)||(!(nIsZero(n[row][i]))))
       nDelete(&(n[row][i]));
-  omfree(n[row]);
+  omFree(n[row]);
   n[row]=NULL;
 }
@@ -642 +644 @@
 tgb_sparse_matrix::tgb_sparse_matrix(int i, int j, ring rarg)
 {
-  mp=(mac_poly*) omalloc(i*sizeof (mac_poly));;
+  mp=(mac_poly*) omAlloc(i*sizeof (mac_poly));;
   int z;
   for(z=0;z<i;z++)
@@ -706 +708 @@
       number n=get(i,j);
       n_Write(n,currRing);
-      char *s=StringEndS(); PrintS(s); omFree(s);
+      char *s=StringEndS();
+      PrintS(s);
+      omFree(s);
       PrintS("\t");
     }