Changeset 485989 in git

Timestamp:

Oct 1, 2013, 10:58:43 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

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

Children:

87f627ffaf78fab8020e21cbc82112b42eb09475

Parents:

62393da950b3f0e2f7ae740773cd556f16a20bda

Message:

fix: missing pivotscaling before comparing matrices

now canonicalizing cones will properly scale pivots to one,
so that the system of inequalities and equations becomes unique,
and cones can be properly compared via those two matrices.

File:

• gfanlib/gfanlib_zcone.cpp (modified) (2 diffs)

gfanlib/gfanlib_zcone.cpp

@@ -699 +699 @@
           QMatrix m=ZToQMatrix(equations);
           m.reduce();
-          m.REformToRREform();
+          m.REformToRREform(true);
           ZMatrix inequalities2(0,equations.getWidth());
           for(int i=0;i<inequalities.getHeight();i++)
@@ -1224 +1224 @@
   ZCone temp2=f;
   temp2.canonicalize();
-
   return !(temp2!=temp1);
 }