Changeset 5ff68b in git for gfanlib/gfanlib_zfan.cpp

Timestamp:

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

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

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_zfan.cpp (modified) (4 diffs)

gfanlib/gfanlib_zfan.cpp

@@ -37 +37 @@
   {
     IntVector indices=getConeIndices(dimension,index,orbit,maximal);
-    return this->complex->makeZCone(indices);
+    ZCone ret=this->complex->makeZCone(indices);
+    if(maximal)ret.setMultiplicity(((orbit)?multiplicitiesOrbits:multiplicities)[dimension][index]);
+    return ret;
   }
   IntVector ZFan::getConeIndices(int dimension, int index, bool orbit, bool maximal)const
@@ -59 +61 @@
         complex = new SymmetricComplex(coneCollection->toSymmetricComplex());
         complex->buildConeLists(false,false,&cones);
-        complex->buildConeLists(true,false,&maximalCones);
+        complex->buildConeLists(true,false,&maximalCones,&multiplicities);
         complex->buildConeLists(false,true,&coneOrbits);
-        complex->buildConeLists(true,true,&maximalConeOrbits);
+        complex->buildConeLists(true,true,&maximalConeOrbits,&multiplicitiesOrbits);
       }
   }
@@ -316 +318 @@
     return complex->isPure();
   }
-  bool ZFan::isComplete()const
-  {
-    ensureConeCollection();
-    if(coneCollection->isEmpty())
-      return 0;
-    int ambientdim=coneCollection->getAmbientDimension();
-    int linealitydim=coneCollection->dimensionOfLinealitySpace();
-    return (ambientdim==linealitydim);
-  }
   void ZFan::insert(ZCone const &c)
   {
@@ -363 +356 @@
 }
 
-std::string ZFan::toStringJustRaysAndMaximalCones(int flags)const
-{
-  ensureComplex();
-  return complex->toStringJustRaysAndMaximalCones(flags);
-}
-
 /*int ZFan::getAmbientDimension()const
 {