Changeset 1d43d18 in git

Timestamp:

Jan 5, 2010, 5:31:10 PM (13 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

287cc89f3328634c02f880d1edd4407bebd029e6

Parents:

c1b19ccf41e1037d164be1cd878738e7b2cdfaec

Message:

dd_MatrixCanonicalize is evil(tm)


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

File:

• kernel/gfan.cc (modified) (5 diffs)

kernel/gfan.cc

@@ -1288 +1288 @@
                                 markingsAreCorrect=TRUE;
                         }
-
+                        
                         for (int jj=0;jj<this->numVars;jj++)
                         {                               
@@ -1340 +1340 @@
         dd_rowindex newpos;
         
-        dd_MatrixCanonicalize(&intPointMatrix,&implLin,&redrows,&newpos,&err);
-//      dd_MatrixCanonicalizeLinearity(&intPointMatrix,&implLin, &newpos,&err);
+//      dd_MatrixCanonicalize(&intPointMatrix,&implLin,&redrows,&newpos,&err);
+        dd_MatrixCanonicalizeLinearity(&intPointMatrix,&implLin, &newpos,&err);
         //dd_MatrixRedundancyRemove is our time sink!
 //      dd_MatrixRedundancyRemove(&intPointMatrix,&redrows,&newpos,&err);
@@ -1539 +1539 @@
 {
 //Remove strictly positive rows
-//      int *posRowsArray=NULL;
-//      int num_alloc=0;
-//      int num_elts=0;
+        int *posRowsArray=NULL;
+        int num_alloc=0;
+        int num_elts=0;
 //      for(int ii=0;ii<ddineq->rowsize;ii++)
 //      {
@@ -1590 +1590 @@
 //      free(posRowsArray);
         //Remove zeroes
-        int rowsize=ddineq->rowsize;
+//      int rowsize=ddineq->rowsize;
         for(int ii=0;ii<ddineq->rowsize;ii++)
         {
@@ -1598 +1598 @@
                 {
                         (*iv)[jj]=(int)mpq_get_d(ddineq->matrix[ii][jj+1]);
-                        if((*iv)[ii]>0)
-                                posCtr++;
+//                      if((*iv)[ii]>0)
+//                              posCtr++;
                 }
-                if( (iv->compare(0)==0)) //|| (posCtr==iv->length()) )
+                if( (iv->compare(0)==0) )//|| (posCtr==iv->length()) )
                 {
                         dd_MatrixRowRemove(&ddineq,ii+1);