Changeset 9922fa7 in git

Timestamp:

Apr 30, 2018, 4:37:20 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9ae5a3bbc24553f5fdd77d09f6bd086318329be3

Parents:

35a2fb48e744c3334747118a4c8ac8457f0ba3ec

Message:

fix: format + handling very large matrices in slimgb (>2GB)

File:

• kernel/GBEngine/tgb_internal.h (modified) (17 diffs)

kernel/GBEngine/tgb_internal.h

@@ -129 +129 @@
   int len;
   BOOLEAN onlyBorrowed;
-  bool operator<(const MonRedRes& other) const{
+  bool operator<(const MonRedRes& other) const
+  {
     int cmp=p_LmCmp(p,other.p,currRing);
-    if ((cmp<0)||((cmp==0)&&((onlyBorrowed)&&(!(other.onlyBorrowed))))){
+    if ((cmp<0)||((cmp==0)&&((onlyBorrowed)&&(!(other.onlyBorrowed)))))
+    {
       return true;
     } else return false;
   }
   DataNoroCacheNode* ref;
-  MonRedRes(){
+  MonRedRes()
+  {
     ref=NULL;
     p=NULL;
@@ -832 +835 @@
 */
 
-template<class number_type> SparseRow<number_type>* convert_to_sparse_row(number_type* temp_array,int temp_size,int non_zeros){
+template<class number_type> SparseRow<number_type>* convert_to_sparse_row(number_type* temp_array,int temp_size,int non_zeros)
+{
 SparseRow<number_type>* res=new SparseRow<number_type>(non_zeros);
 //int pos=0;
@@ -839 +843 @@
 int* it_idx=res->idx_array;
 #if 0
-for(i=0;i<cache->nIrreducibleMonomials;i++){
-  if (!(0==temp_array[i])){
+for(i=0;i<cache->nIrreducibleMonomials;i++)
+{
+  if (!(0==temp_array[i]))
+  {
 
     res->idx_array[pos]=i;
@@ -1063 +1069 @@
           #ifndef SING_NDEBUG
           assume(idx<temp_size);
-          #endif
+          #endif
         }
 }
@@ -1157 +1163 @@
    for(i=0;i<cache->nIrreducibleMonomials;i++)
    {
-     //if (!(temp_array[i]==0)){
+     //if (!(temp_array[i]==0))
+     //{
      //  non_zeros++;
      //}
@@ -1403 +1410 @@
   return res;
 }
-template<class number_type> SparseRow<number_type> * noro_red_to_non_poly_t(poly p, int &len, NoroCache<number_type>* cache,slimgb_alg* c){
+template<class number_type> SparseRow<number_type> * noro_red_to_non_poly_t(poly p, int &len, NoroCache<number_type>* cache,slimgb_alg* c)
+{
   assume(len==pLength(p));
   if (p==NULL)
@@ -1459 +1467 @@
 
 
-template <class number_type > void write_poly_to_row(number_type* row, poly h, poly*terms, int tn, ring r){
+template <class number_type > void write_poly_to_row(number_type* row, poly h, poly*terms, int tn, ring r)
+{
   //poly* base=row;
-  while(h!=NULL){
+  while(h!=NULL)
+  {
     //Print("h:%i\n",h);
     number coef=p_GetCoeff(h,r);
@@ -1472 +1482 @@
   }
 }
-template <class number_type > poly row_to_poly(number_type* row, poly* terms, int tn, ring r){
+template <class number_type > poly row_to_poly(number_type* row, poly* terms, int tn, ring r)
+{
   poly h=NULL;
   int j;
   number_type zero=0;//;npInit(0);
-  for(j=tn-1;j>=0;j--){
-    if (!(zero==(row[j]))){
+  for(j=tn-1;j>=0;j--)
+  {
+    if (!(zero==(row[j])))
+    {
       poly t=terms[j];
       t=p_LmInit(t,r);
@@ -1517 +1530 @@
     this->ncols=nncols;
     this->nrows=nnrows;
-    rows=(number_type**) omalloc(nnrows*sizeof(number_type*));
-    startIndices=(int*)omalloc(nnrows*sizeof(int));
+    rows=(number_type**) omalloc((size_t)nnrows*sizeof(number_type*));
+    startIndices=(int*)omalloc((size_t)nnrows*sizeof(int));
     int i;
     for(i=0;i<nnrows;i++)
     {
-      rows[i]=array+(i*nncols);
+      rows[i]=array+((long)i*(long)nncols);
       updateStartIndex(i,-1);
     }
@@ -1772 +1785 @@
   int c=0;
   int r=0;
-  while(mat.findPivot(r,c)){
+  while(mat.findPivot(r,c))
+  {
     //int pivot=find_pivot()
       mat.reduceOtherRowsForward(r);
@@ -1785 +1799 @@
 }
 //int term_nodes_sort_crit(const void* a, const void* b);
-template <class number_type> void noro_step(poly*p,int &pn,slimgb_alg* c){
+template <class number_type> void noro_step(poly*p,int &pn,slimgb_alg* c)
+{
   //Print("Input rows %d\n",pn);
   int j;
@@ -1841 +1856 @@
   //  Print("Evaluate Rows \n");
   pn=non_zeros;
-  number_type* number_array=(number_type*) omalloc0(n*pn*sizeof(number_type));
+  number_type* number_array=(number_type*) omalloc0(((size_t)n)*pn*sizeof(number_type));
 
   for(j=0;j<pn;j++)
   {
     int i;
-    number_type* row=number_array+n*j;
+    number_type* row=number_array+((long)n)*(long)j;
     /*for(i=0;i<n;i++)
     {
@@ -1883 +1898 @@
 
   int p_pos=0;
-  for(j=0;j<pn;j++){
-    poly h=row_to_poly(number_array+j*n,terms,n,c->r);
-    if(h!=NULL){
+  for(j=0;j<pn;j++)
+  {
+    poly h=row_to_poly(number_array+((long)j)*((long)n),terms,n,c->r);
+    if(h!=NULL)
+    {
       p[p_pos++]=h;
     }
@@ -1901 +1918 @@
 }
 
-template <class number_type> void NoroCache<number_type>::collectIrreducibleMonomials( std::vector<DataNoroCacheNode<number_type> *>& res){
+template <class number_type> void NoroCache<number_type>::collectIrreducibleMonomials( std::vector<DataNoroCacheNode<number_type> *>& res)
+{
   int i;
-  for(i=0;i<root.branches_len;i++){
+  for(i=0;i<root.branches_len;i++)
+  {
     collectIrreducibleMonomials(1,root.branches[i],res);
   }
 }
-template <class number_type> void NoroCache<number_type>::collectIrreducibleMonomials(int level, NoroCacheNode* node, std::vector<DataNoroCacheNode<number_type>*>& res){
+template <class number_type> void NoroCache<number_type>::collectIrreducibleMonomials(int level, NoroCacheNode* node, std::vector<DataNoroCacheNode<number_type>*>& res)
+{
   assume(level>=0);
   if (node==NULL) return;
@@ -1928 +1948 @@
 }
 
-template<class number_type> DataNoroCacheNode<number_type>* NoroCache<number_type>::getCacheReference(poly term){
+template<class number_type> DataNoroCacheNode<number_type>* NoroCache<number_type>::getCacheReference(poly term)
+{
   int i;
   NoroCacheNode* parent=&root;
-  for(i=1;i<(currRing->N);i++){
+  for(i=1;i<(currRing->N);i++)
+  {
     parent=parent->getBranch(p_GetExp(term,i,currRing));
-    if (!(parent)){
+    if (!(parent))
+    {
       return NULL;
     }
@@ -1940 +1963 @@
   return res_holder;
 }
-template<class number_type> poly NoroCache<number_type>::lookup(poly term, BOOLEAN& succ, int & len){
+template<class number_type> poly NoroCache<number_type>::lookup(poly term, BOOLEAN& succ, int & len)
+{
   int i;
   NoroCacheNode* parent=&root;
-  for(i=1;i<(currRing->N);i++){
+  for(i=1;i<(currRing->N);i++)
+  {
     parent=parent->getBranch(p_GetExp(term,i,currRing));
-    if (!(parent)){
+    if (!(parent))
+    {
       succ=FALSE;
       return NULL;
@@ -1951 +1977 @@
   }
   DataNoroCacheNode<number_type>* res_holder=(DataNoroCacheNode<number_type>*) parent->getBranch(p_GetExp(term,i,currRing));
-  if (res_holder){
+  if (res_holder)
+  {
     succ=TRUE;
-    if ( /*(*/ res_holder->value_len==backLinkCode /*)*/ ){
+    if ( /*(*/ res_holder->value_len==backLinkCode /*)*/ )
+    {
       len=1;
       return term;