Changeset 29d5f5 in git

Timestamp:

Oct 10, 2004, 12:30:36 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

bb816a0c6c07bfea5755e3204da9de713b5ef949

Parents:

2de2a9d3e8f79175378bf84769b7f049bae4b7e5

Message:

*bricken: char 0 optimizing


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

Location:

Singular

Files:

• tgb.cc (modified) (12 diffs)
• tgb.h (modified) (2 diffs)

Singular/tgb.cc

@@ -520 +520 @@
   P.p=h; /*p_Copy(h,c->r);*/
   P.FDeg=pFDeg(P.p,c->r);
+ 
   if (!rField_is_Zp(c->r)){ 
     pCleardenom(P.p);
     pContent(P.p); //is a duplicate call, but belongs here
-  }
-  
+    
+  }
   else                     
     pNorm(P.p);
- 
+  pNormalize(P.p);
 
   c->strat->enterS(P,i,c->strat);
@@ -2336 +2337 @@
 
 
-tgb_sparse_matrix::tgb_sparse_matrix(int i, int j){
+tgb_sparse_matrix::tgb_sparse_matrix(int i, int j, ring rarg){
   mp=(mac_poly*) omalloc(i*sizeof (mac_poly));;
   int z;
@@ -2347 +2348 @@
   this->rows=i;
   free_numbers=FALSE;
+  r=rarg;
 }
 tgb_sparse_matrix::~tgb_sparse_matrix(){
@@ -2503 +2505 @@
   else
     return FALSE;
+}
+void tgb_sparse_matrix::row_normalize(int row){
+  if (!rField_has_simple_inverse(r))  /* Z/p, GF(p,n), R, long R/C */
+  {
+    mac_poly m=mp[row];
+        while (m!=NULL)
+        {
+          if (currRing==r) {nTest(m->coef);}
+          n_Normalize(m->coef,r);
+          m=m->next;
+        }
+  }
 }
 int tgb_sparse_matrix::non_zero_entries(int row){
@@ -2567 +2581 @@
 }
 
-void simple_gauss(tgb_sparse_matrix* mat){
+void simple_gauss(tgb_sparse_matrix* mat, calc_dat* c){
   int col, row;
   int* row_cache=(int*) omalloc(mat->get_rows()*sizeof(int));
@@ -2639 +2653 @@
     
     found_in_row=row;
+    BOOLEAN must_reduce=FALSE;
     assume(pn<=mat->get_rows());
     for(i=row+1;i<=max_in_area;i++){
@@ -2649 +2664 @@
         col=first;
         found_in_row=i;
+        must_reduce=FALSE;
+      }
+      else {
+        if(first==col)
+          must_reduce=TRUE;
       }
     }
@@ -2674 +2694 @@
     row_cache[found_in_row]=h;
 
+
+
+    if(!must_reduce){
+      row++;
+      continue;
+    }
     //reduction
+    //must extract content and normalize here
+    mat->row_normalize(row);
 
     //for(i=row+1;i<pn;i++){
@@ -2698 +2726 @@
         mat->mult_row(i,n2);
         mat->add_lambda_times_row(i,row,n1);
+        nDelete(&n1);
+        nDelete(&n2);
         assume(mat->is_zero_entry(i,col));
         row_cache[i]=mat->min_col_not_zero_in_row(i);
@@ -2921 +2951 @@
 }
 static tgb_sparse_matrix* build_sparse_matrix(poly* p,int p_index,poly* done, int done_index, calc_dat* c){
-  tgb_sparse_matrix* t=new tgb_sparse_matrix(p_index,done_index);
+  tgb_sparse_matrix* t=new tgb_sparse_matrix(p_index,done_index,c->r);
   int i, pos;
   //  Print("\n 0:%s\n",pString(done[done_index-1]));
@@ -3463 +3493 @@
 //   simple_gauss2(mat);
   tgb_sparse_matrix* mat=build_sparse_matrix(p,p_index,done, done_index,c);
-  simple_gauss(mat);
+  simple_gauss(mat,c);
   m_size=mat->get_rows();
   m=(poly*) omalloc(m_size*sizeof(poly));
@@ -4962 +4992 @@
     r[rn].flatten();
     kBucketClear(r[rn].bucket,&red,&red_len);
+    if (!rField_is_Zp(c->r))
+    {
+      pContent(red);
+      pCleardenom(red);//should be unnecessary
+     
+    }
+    pNormalize(red);
   }
   if (erg.to_reduce_u-erg.to_reduce_l>5){

Singular/tgb.h

@@ -136 +136 @@
 class tgb_sparse_matrix{
  private:
+  ring r;
   mac_poly* mp;
   int columns;
@@ -144 +145 @@
   friend poly free_row_to_poly(tgb_sparse_matrix* mat, int row, poly* monoms, int monom_index);
   friend void init_with_mac_poly(tgb_sparse_matrix* mat, int row, mac_poly m);
-  tgb_sparse_matrix(int i, int j);
+  tgb_sparse_matrix(int i, int j, ring rarg);
   ~tgb_sparse_matrix();
   int get_rows();
   int get_columns();
   void print();
+  void row_normalize(int row);
   //  void perm_rows(int i, int j);
   void perm_rows(int i, int j){