Changeset f2e5d3 in git

Timestamp:

Sep 11, 2004, 4:31:57 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

496ccbf85092197727a74e5175eb81f14d1d85e2

Parents:

ac386536495e0f0b17da0d31bac81682cc5f37b7

Message:

*bricken: further bugfixing


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

File:

• Singular/tgb.cc (modified) (7 diffs)

Singular/tgb.cc

@@ -2014 +2014 @@
     
     found_in_row=row;
-    assume(pn<mat->get_rows());
+    assume(pn<=mat->get_rows());
     for(i=row+1;i<pn;i++){
       int first=mat->min_col_not_zero_in_row(i);
@@ -2087 +2087 @@
       v=done_index-1-v;
       t->set(i,v,nCopy(p_i->coef));
+      p_i=p_i->next;
     }
   }
@@ -2275 +2276 @@
   //Print("Done_index:%i",done_index);
   if(done_index>0)
+  {
     pTest(done[0]);
+ }
   for(i=1;i<done_index;i++)
   {
@@ -2287 +2290 @@
 #ifdef TGB_DEBUG
   for(i=0;i<done_index;i++)
+  {
     pTest(done[i]);
+  }
 #endif
   poly* m;
@@ -2296 +2301 @@
     m_size+=pLength(p[i]);
   }
+  m=(poly*) omalloc(m_size*sizeof(poly));
   //q=(poly*) omalloc(m_size*sizeof(poly));
- 
+#ifdef TGB_DEBUG
+  
+  for(i=0;i<done_index;i++)
+  {
+    
+    pTest(done[i]);
+  }
+#endif
+  
+  assume(done_index==0);
   for(i=0;i<p_index;i++)
   {
+     assume(done_index==0);
     poly p_i=p[i];
+     assume(done_index==0);
+    pTest(p[i]);
+     assume(done_index==0);
     while(p_i)
     {
+       assume(done_index==0);
       m[m_index]=pLmInit(p_i);
+      assume(done_index==0);
       pSetCoeff(m[m_index],nInit(1));
-      p_i=p_i->next;
+       assume(done_index==0);
+       p_i=p_i->next;
+        assume(done_index==0);
       m_index++;
-    }
-  }
+       assume(done_index==0);
+    }
+  }
+#ifdef TGB_DEBUG
+      
+      for(i=0;i<done_index;i++)
+      {
+        
+        pTest(done[i]);
+      }
+#endif
   int q_size=m_index;
   poly* q=(poly*) omalloc(q_size*sizeof(poly));
   int q_index=0;
   //next Step additional reductors
+  #ifdef TGB_DEBUG
+      
+      for(i=0;i<done_index;i++)
+      {
+        
+        pTest(done[i]);
+      }
+#endif
   while(m_index>0)
   {
+#ifdef TGB_DEBUG
+      
+      for(i=0;i<done_index;i++)
+      {
+        
+        pTest(done[i]);
+      }
+#endif
     qsort(m, m_index,sizeof(poly),pLmCmp_func);
 
     
     pos=0;
+    #ifdef TGB_DEBUG
+      
+      for(i=0;i<done_index;i++)
+      {
+        
+        pTest(done[i]);
+      }
+#endif
     for(i=1;i<m_index;i++)
     {
+      pTest(m[i]);
+      pTest(m[pos]);
       if((!(pLmEqual(m[i],m[pos]))))
         m[++pos]=m[i];
@@ -2344 +2402 @@
       q=(poly*) omalloc(q_size*sizeof(poly));
     }
-    for(i=0;i<m_index;i++)
-    {
-      BOOLEAN in_done=FALSE;
-      pTest(m[i]);
 #ifdef TGB_DEBUG
       int j;
       for(j=0;j<done_index;j++)
       {
-        Print("%i %i\n",j,i);
+        
+        pTest(done[j]);
+      }
+#endif
+    for(i=0;i<m_index;i++)
+    {
+      BOOLEAN in_done=FALSE;
+      pTest(m[i]);
+#ifdef TGB_DEBUG
+     
+      for(j=0;j<done_index;j++)
+      {
+        //Print("%i %i\n",j,i);
         pTest(done[j]);
       }
@@ -2682 +2748 @@
   while(c->to_destroy)
   {
-    pDelete(&c->to_destroy->p);
+    pDelete(&(c->to_destroy->p));
     poly_list_node* old=c->to_destroy;
     c->to_destroy=c->to_destroy->next;