Changeset a5bf88 in git

Timestamp:

Jun 22, 1999, 1:24:02 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

1eb7af12ba2eda02be4f55b12705297ff94d3b13

Parents:

a36a1a32a3460ef9a46e7836e70238b00c8c5618

Message:

normalize and cleardenom


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

File:

• Singular/sparsmat.cc (modified) (16 diffs)

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.8 1999-06-10 09:01:17 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.9 1999-06-22 11:24:02 pohl Exp $ */
 
 /*
@@ -19 +19 @@
 #include "ideals.h"
 #include "numbers.h"
+#include "longrat.h"
 #include "sparsmat.h"
 
@@ -58 +59 @@
 static smpoly smElemCopy(smpoly);
 static float smPolyWeight(smpoly);
-static smpoly smPoly2Smpoly(poly p);
-static poly smSmpoly2Poly(smpoly a);
+static smpoly smPoly2Smpoly(poly);
+static poly smSmpoly2Poly(smpoly);
+static BOOLEAN smHaveDenom(poly);
+static number smCleardenom(ideal);
 
 /* class for sparse matrix:
@@ -89 +92 @@
   int inred;           // unreducable part
   int rpiv, cpiv;      // position of the pivot
-  unsigned short *perm;// permutation of rows
+  int normalize;       // Normalization flag
+  EXPONENT_TYPE *perm; // permutation of rows
   float wpoints;       // weight of all points
   float *wrw, *wcl;    // weights of rows and columns
@@ -120 +124 @@
   void smSign();
   void smInitPerm();
+  int smCheckNormalize();
+  void smNormalize();
 public:
   sparse_mat(ideal);
@@ -189 +195 @@
     return NULL;
   }
+  number diag,h=nInit(1);
   poly res,save;
   ring origR;
   sip_sring tmpR;
+  sparse_mat *det;
   ideal II=smRingCopy(I,&origR,tmpR);
-  sparse_mat *det = new sparse_mat(II);
-
+
+  diag = smCleardenom(II);
+  det = new sparse_mat(II);
   idDelete(&II);
   if (det->smGetAct() == NULL)
@@ -214 +223 @@
     smRingClean(origR,tmpR);
   }
+  if (nEqual(diag,h) == FALSE)
+  {
+    pMultN(res,diag);
+    pNormalize(res);
+  }
+  nDelete(&diag);
+  nDelete(&h);
   return res;
 }
@@ -312 +328 @@
   tored = nrows; // without border
   i = tored+1;
-  perm = (unsigned short *)Alloc(sizeof(unsigned short)*(i+1));
+  perm = (EXPONENT_TYPE *)Alloc(sizeof(EXPONENT_TYPE)*(i+1));
   perm[i] = 0;
   m_row = (smpoly *)Alloc0(sizeof(smpoly)*i);
@@ -349 +365 @@
   Free((ADDRESS)wrw, sizeof(float)*i);
   Free((ADDRESS)m_row, sizeof(smpoly)*i);
-  Free((ADDRESS)perm, sizeof(unsigned short)*(i+1));
+  Free((ADDRESS)perm, sizeof(EXPONENT_TYPE)*(i+1));
 }
 
@@ -396 +412 @@
     return res;
   }
+  normalize = 0;
   this->smInitPerm();
   this->smPivot();
@@ -520 +537 @@
     return;
   }
+  normalize = this->smCheckNormalize();
+  if (normalize) this->smNormalize();
   this->smPivot();
   this->smSelectPR();
@@ -538 +557 @@
   loop
   {
+    if (normalize) this->smNormalize();
     this->smNewPivot();
     this->smSelectPR();
@@ -1416 +1436 @@
       if (f) SM_DIV(ha, m_res[f]->m);
       a->m = ha;
+      if (normalize) pNormalize(a->m);
     }
     a = a->n;
@@ -1444 +1465 @@
         a->m = ha;
       }
+      if (normalize) pNormalize(a->m);
+      a = a->n;
+    } while (a != NULL);
+  }
+}
+
+/*
+* check for denominators
+*/
+int sparse_mat::smCheckNormalize()
+{
+  int i;
+  smpoly a;
+
+  for (i=act; i; i--)
+  {
+    a = m_act[i];
+    do
+    {
+      if(smHaveDenom(a->m)) return 1;
+      a = a->n;
+    } while (a != NULL);
+  }
+  return 0;
+}
+
+/*
+* normalize 
+*/
+void sparse_mat::smNormalize()
+{
+  smpoly a;
+  int i;
+  int e = crd;
+
+  for (i=act; i; i--)
+  {
+    a = m_act[i];
+    do
+    {
+      if (e == a->e) pNormalize(a->m);
       a = a->n;
     } while (a != NULL);
@@ -1463 +1525 @@
     if (f) SM_DIV(h, m_res[f]->m);
     a->m = h;
+    if (normalize) pNormalize(a->m);
     a->f = smPolyWeight(a);
     return r;
@@ -2137 +2200 @@
 }
 
+static BOOLEAN smHaveDenom(poly a)
+{
+  BOOLEAN sw;
+  number x,o=nInit(1);
+
+  while (a != NULL)
+  {
+    x = nGetDenom(pGetCoeff(a));
+    sw = nEqual(x,o);
+    nDelete(&x);
+    if (!sw)
+    {
+      nDelete(&o);
+      return TRUE;
+    }
+    pIter(a);
+  }
+  nDelete(&o);
+  return FALSE;
+}
+
+static number smCleardenom(ideal id)
+{
+  poly a;
+  number x,y,res=nInit(1);
+  BOOLEAN sw=FALSE;
+
+  for (int i=0; i<IDELEMS(id); i++)
+  {
+    a = id->m[i];
+    sw = smHaveDenom(a);
+    if (sw) break;
+  }
+  if (!sw) return res;
+  for (int i=0; i<IDELEMS(id); i++)
+  {
+    a = id->m[i];
+    x = nCopy(pGetCoeff(a));
+    pCleardenom(a);
+    y = nDiv(x,pGetCoeff(a));
+    nDelete(&x);
+    x = nMult(res,y);
+    nNormalize(x);
+    nDelete(&res);
+    res = x;
+  }
+  return res;
+}
+