Changeset 5ff68b in git for gfanlib/gfanlib_matrix.h

Timestamp:

Oct 14, 2014, 10:31:31 PM (10 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

97351e66f70a4390d6f911ee38436e695b8ec551

Parents:

5a60835ee02dcb3d57c9e469c5d50e25ec5d29db

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-10-14 23:31:31+03:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:01+01:00

Message:

chg: new gfanlib version, fixed multiplicities of cones inside fans

File:

• gfanlib/gfanlib_matrix.h (modified) (7 diffs)

gfanlib/gfanlib_matrix.h

@@ -19 +19 @@
   std::vector<Vector<typ> > rows;
 public:
+  // rowIterator;
+ // std::vector<Vector<typ> >::iterator rowsBegin(){return rows.begin();}
+//  std::vector<Vector<typ> >::iterator rowsEnd(){return rows.end();}
   inline int getHeight()const{return height;};
   inline int getWidth()const{return width;};
@@ -76 +79 @@
   {
     assert(rows.size()>0);
-    rows.resize(rows.size()-1);
+    rows.pop_back();
     height--;
   }
@@ -184 +187 @@
     return f;
   }
+
+  std::string toString()const
+  {
+          std::stringstream f;
+          f<<*this;
+          return f.str();
+  }
+
   /**
      Swaps the i th and the j th row.
@@ -296 +307 @@
   }
   /**
-     Performs a Gauss reduction and returns the number of row swaps
-     done.  The result is a matrix in row echelon form. The pivots may
+     Performs a Gauss reduction and returns the number of row swaps (and negative scalings)
+     done. The result is a matrix in row echelon form. The pivots may
      not be all 1.  In terms of Groebner bases, what is computed is a
      minimal (not necessarily reduced) Groebner basis of the linear
@@ -309 +320 @@
   {
     assert(integral || typ::isField());
+    assert(!makePivotsOne || !integral);
+
     int retSwaps=0;
     int currentRow=0;
@@ -325 +338 @@
             if(makePivotsOne)
               {//THE PIVOT SHOULD BE SET TO ONE IF INTEGRAL IS FALSE
-                if(rows[currentRow][i].sign()>=0)
-                  retSwaps++;
+                if(rows[currentRow][i].sign()>=0)retSwaps++;
                 typ inverse=typ(1)/rows[currentRow][i];
                 //                if(!rows[currentRow][i].isOne())
@@ -517 +529 @@
   int reduceAndComputeRank()
   {
-    if (typ::isField())
-      reduce();
-    else
-      reduce(false,true,false);
+    reduce(false,!typ::isField(),false);
     int ret=0;
     int pivotI=-1;