Changeset 7cc3fd in git for gfanlib/gfanlib_symmetriccomplex.cpp

Timestamp:

Aug 8, 2016, 2:16:42 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0d1bcb7165ef371658ad444b7547d9fdf53d7136

Parents:

6a97c544535256c37da0f10bcb6821b592546c6815813d0947d4221b8c060256fd6994a48e3c6605

Message:

t push origin spielwieseMerge branch 'YueRen-gfanlib0.6' into spielwiese

File:

• gfanlib/gfanlib_symmetriccomplex.cpp (modified) (3 diffs)

gfanlib/gfanlib_symmetriccomplex.cpp

@@ -185 +185 @@
 int SymmetricComplex::getLinDim()const
 {
-  return linealitySpace.getHeight();
+        return linealitySpace.getHeight();
 }
 
@@ -595 +595 @@
 
     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_maximalCones)polymakeFile.writeStringProperty("MAXIMAL_CONES",toStringJustCones(getMinDim(),getMaxDim(),true,flags&FPF_group, 0,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())
@@ -637 +635 @@
             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");
           }