[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 3a9db11bfc2f4f896a7d50f68c95253f9638b89b
Author: Yue Ren <ren at mathematik.uni-kl.de>
Date:   Tue Mar 20 18:04:35 2012 +0100

    chg: renamed some gfanlib wrapper functions, conversion functions now pass pointers

diff --git a/gfanlib/gfanlib_zcone.cpp b/gfanlib/gfanlib_zcone.cpp
index cf195e4..9b60e70 100644
--- a/gfanlib/gfanlib_zcone.cpp
+++ b/gfanlib/gfanlib_zcone.cpp
@@ -765,7 +765,7 @@ ZCone::ZCone(ZMatrix const &inequalities_, ZMatrix const &equations_, ZMatrix co
   inequalities(inequalities_),
   equations(equations_),
   cachedExtremeRays(cachedExtremeRays_),
-  cachedGeneratorsOfLinealitySpace(cachedExtremeRays_),
+  cachedGeneratorsOfLinealitySpace(cachedGeneratorsOfLinealitySpace_),
   cachedGeneratorsOfSpan(cachedGeneratorsOfSpan_),
   state(0),
   preassumptions(preassumptions_),
@@ -965,13 +965,20 @@ ZCone ZCone::givenByRays(ZMatrix const &generators, ZMatrix const &linealitySpac
   dual.findFacets();
   dual.canonicalize();
   ZMatrix inequalities=dual.extremeRays();
+  // because extremeRays was called, the following is already in canonical form
+  ZMatrix extremeRays=dual.getInequalities();
+  ZMatrix linSpace=dual.getEquations();
 
   ZMatrix span=generators;
   span.append(linealitySpace);
   QMatrix m2Q=ZToQMatrix(span);
   ZMatrix equations=QToZMatrixPrimitive(m2Q.reduceAndComputeKernel());
+  // ZMatrix equations=dual.generatorsOfLinealitySpace();
 
-  return ZCone(inequalities,equations);
+  //nothing of the span is known, passed empty matrix will be ignored
+  ZMatrix sspan;
+
+  return ZCone(inequalities,equations,extremeRays,linSpace,sspan,3);
 }
 
 

-- 
an open source computer algebra system