Changeset 5ff68b in git for gfanlib/gfanlib_symmetriccomplex.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_symmetriccomplex.cpp (modified) (13 diffs)

gfanlib/gfanlib_symmetriccomplex.cpp

@@ -59 +59 @@
     sum+=vertices[indices[i]];
 
-  int n=sum.size();
+  unsigned n=sum.size();
   Permutation const &bestPermutation=sortKeyPermutation;
 
-  assert((int)bestPermutation.size()==n);
+  assert(bestPermutation.size()==n);
 
   IntVector indicesNew(indices.size());
@@ -88 +88 @@
 bool SymmetricComplex::Cone::isSubsetOf(Cone const &c)const
 {
-  int next=0;
+  unsigned next=0;
   for(unsigned i=0;i<indices.size();i++)
     {
       while(1)
         {
-          if(next>=(int)c.indices.size())return false;
+          if(next>=c.indices.size())return false;
           if(indices[i]==c.indices[next])break;
           next++;
@@ -183 +183 @@
 
 
+int SymmetricComplex::getLinDim()const
+{
+        return linealitySpace.getHeight();
+}
+
 int SymmetricComplex::getMaxDim()const
 {
@@ -199 +204 @@
 }
 
-
-int SymmetricComplex::getLinDim()const
-{
-  ZMatrix zm=linealitySpace;
-  return zm.reduceAndComputeRank();
-}
 
 bool SymmetricComplex::isMaximal(Cone const &c)const
@@ -248 +247 @@
 #endif
 
-void SymmetricComplex::buildConeLists(bool onlyMaximal, bool compressed, std::vector<std::vector<IntVector > >*conelist/*, ZMatrix *multiplicities*/)const
+void SymmetricComplex::buildConeLists(bool onlyMaximal, bool compressed, std::vector<std::vector<IntVector > >*conelist, std::vector<std::vector<Integer > > *multiplicities)const
 {
   int dimLow=this->linealitySpace.getHeight();
@@ -254 +253 @@
   if(dimHigh<dimLow)dimHigh=dimLow-1;
   if(conelist)*conelist=std::vector<std::vector<IntVector> >(dimHigh-dimLow+1);
+  if(multiplicities)*multiplicities=std::vector<std::vector<Integer> >(dimHigh-dimLow+1);
   for(int d=dimLow;d<=dimHigh;d++)
     {
@@ -262 +262 @@
           int I=0;
           for(ConeContainer::const_iterator i=cones.begin();i!=cones.end();i++,I++)
-            if(i->dimension==d)
-            {
-              numberOfOrbitsOfThisDimension++;
+                  if(i->dimension==d)
+                    {
+                  numberOfOrbitsOfThisDimension++;
               if(!onlyMaximal || isMaximal(*i))
                 {
@@ -270 +270 @@
                   // bool isMax=isMaximal(*i);
                   // bool newOrbit=true;
-                  std::set<std::set<int> > temp;
-                  for(SymmetryGroup::ElementContainer::const_iterator k=sym.elements.begin();k!=sym.elements.end();k++)
-                    {
+                  std::set<std::pair<std::set<int>,Integer> > temp;
+                    for(SymmetryGroup::ElementContainer::const_iterator k=sym.elements.begin();k!=sym.elements.end();k++)
+                      {
                         Cone temp1=i->permuted(*k,*this,false);
-                        temp.insert(temp1.indexSet());
+                        temp.insert(std::pair<std::set<int>,Integer>(temp1.indexSet(),temp1.multiplicity));
                         if(compressed)break;
                     }
-                  for(std::set<std::set<int> >::const_iterator j=temp.begin();j!=temp.end();j++)
+                  for(std::set<std::pair<std::set<int>,Integer> >::const_iterator j=temp.begin();j!=temp.end();j++)
                     {
                       IntVector temp;
-                      for(std::set<int>::const_iterator k=j->begin();k!=j->end();k++)temp.push_back(*k);
+                      for(std::set<int>::const_iterator k=j->first.begin();k!=j->first.end();k++)temp.push_back(*k);
                       if(conelist)(*conelist)[d-dimLow].push_back(temp);
+                      if(multiplicities)(*multiplicities)[d-dimLow].push_back(j->second);
  /*                     if(isMax)if(multiplicities)
                         {
@@ -293 +294 @@
                       // newDimension=false;
                     }
-                }
-            }
-        }
-    }
-
-}
-
-std::string SymmetricComplex::toStringJustCones(int dimLow, int dimHigh, bool onlyMaximal, bool group, std::ostream *multiplicities, bool compressed, bool /*tPlaneSort*/)const
+              }
+                    }
+        }
+    }
+
+}
+
+std::string SymmetricComplex::toStringJustCones(int dimLow, int dimHigh, bool onlyMaximal, bool group, std::ostream *multiplicities, bool compressed, bool tPlaneSort)const
 {
   std::stringstream ret;
@@ -365 +366 @@
 
 
-std::string SymmetricComplex::toStringJustRaysAndMaximalCones(int flags)const
-{
-  PolymakeFile polymakeFile;
-  polymakeFile.create("NONAME","PolyhedralFan","PolyhedralFan",flags&FPF_xml);
-  polymakeFile.writeMatrixProperty("RAYS",vertices,true);
-  polymakeFile.writeStringProperty("MAXIMAL_CONES",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, 0,false,flags&FPF_tPlaneSort));
-
-  std::stringstream s;
-  polymakeFile.writeStream(s);
-  return s.str();
-}
-
-
 ZVector SymmetricComplex::fvector(bool boundedPart)const
 {
@@ -538 +526 @@
     polymakeFile.writeCardinalProperty("LINEALITY_DIM",linealitySpace.getHeight());
     //    polymakeFile.writeMatrixProperty("RAYS",rays,true,comments);
-    polymakeFile.writeMatrixProperty("RAYS",vertices,true);
+        polymakeFile.writeMatrixProperty("RAYS",vertices,true);
     polymakeFile.writeCardinalProperty("N_RAYS",vertices.getHeight());
 
@@ -606 +594 @@
 
 
-    polymakeFile.writeStringProperty("CONES",toStringJustCones(getMinDim(),getMaxDim(),false,flags&FPF_group, 0,false,flags&FPF_tPlaneSort));
-    polymakeFile.writeStringProperty("MAXIMAL_CONES",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, 0,false,flags&FPF_tPlaneSort));
-    polymakeFile.writeStringProperty("CONES_ORBITS",toStringJustCones(getMinDim(),getMaxDim(),false,flags&FPF_group, 0,true,flags&FPF_tPlaneSort));
-    polymakeFile.writeStringProperty("MAXIMAL_CONES_ORBITS",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, 0,true,flags&FPF_tPlaneSort));
+    if(flags&FPF_cones)polymakeFile.writeStringProperty("CONES",toStringJustCones(getMinDim(),getMaxDim(),false,flags&FPF_group, 0,false,flags&FPF_tPlaneSort));
+    std::stringstream multiplicities;
+    if(flags&FPF_maximalCones)polymakeFile.writeStringProperty("MAXIMAL_CONES",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, &multiplicities,false,flags&FPF_tPlaneSort));
+    if(flags&FPF_conesCompressed)polymakeFile.writeStringProperty("CONES_ORBITS",toStringJustCones(getMinDim(),getMaxDim(),false,flags&FPF_group, 0,true,flags&FPF_tPlaneSort));
+    if((flags&FPF_conesCompressed) && (flags&FPF_maximalCones))polymakeFile.writeStringProperty("MAXIMAL_CONES_ORBITS",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, 0,true,flags&FPF_tPlaneSort));
+    if(flags&FPF_multiplicities)polymakeFile.writeStringProperty("MULTIPLICITIES",multiplicities.str());
 
     if(!sym.isTrivial())
@@ -647 +637 @@
             stringstream multiplicities;
             polymakeFile.writeStringProperty("MAXIMAL_CONES",symCom.toString(symCom.getMinDim(),symCom.getMaxDim(),true,flags&FPF_group, &multiplicities,false,flags&FPF_tPlaneSort));
-            if(flags&FPF_multiplicities)polymakeFile.writeStringProperty("MULTIPLICITIES",multiplicities.str());
   //          log1 fprintf(Stderr,"Done producing list of maximal cones.\n");
           }