Changeset f80a530 in git

Timestamp:

Jul 3, 2013, 4:11:47 PM (10 years ago)

Author:

Yue Ren <ren@…>

Branches:

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

Children:

c8e1159b19cf2962fcc89a7d558f7fc2ef5222ec

Parents:

e44b1496e7a09174e77e9bf67544f253e86b39c8

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-07-03 16:11:47+02:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2013-07-18 14:56:51+02:00

Message:

chg: print routines for polyhedral fans

corresponds to 7add05a9a5fb7b1e61023a1b6873e366d004d453 in master

Files:

• dyn_modules/callgfanlib/bbfan.cc (modified) (2 diffs)
• dyn_modules/callgfanlib/bbfan.h (modified) (1 diff)
• gfanlib/gfanlib_polymakefile.cpp (modified) (2 diffs)
• gfanlib/gfanlib_symmetriccomplex.cpp (modified) (2 diffs)
• gfanlib/gfanlib_symmetriccomplex.h (modified) (1 diff)
• gfanlib/gfanlib_zfan.cpp (modified) (2 diffs)
• gfanlib/gfanlib_zfan.h (modified) (1 diff)

dyn_modules/callgfanlib/bbfan.cc

@@ -45 +45 @@
   {
     gfan::ZFan* zf = (gfan::ZFan*)d;
-    std::string s = zf->toString();
+    std::string s = zf->toStringJustRaysAndMaximalCones();
     return omStrDup(s.c_str());
   }
@@ -718 +718 @@
 }
 
-gfan::ZMatrix rays(gfan::ZFan* zf)
+gfan::ZMatrix rays(const gfan::ZFan* const zf)
 {
   gfan::ZMatrix rays(0,zf->getAmbientDimension());

dyn_modules/callgfanlib/bbfan.h

@@ -16 +16 @@
 int getLinealityDimension(gfan::ZFan* zf);
 int isSimplicial(gfan::ZFan* zf);
-gfan::Matrix<gfan::Integer> rays(gfan::ZFan* zf);
+gfan::Matrix<gfan::Integer> rays(const gfan::ZFan* const zf);
 
 #endif

gfanlib/gfanlib_polymakefile.cpp

@@ -170 +170 @@
   else
     {
-      fprintf(f,"_application %s\n",application.c_str());
-      fprintf(f,"_version 2.2\n");
-      fprintf(f,"_type %s\n",type.c_str());
+      // fprintf(f,"_application %s\n",application.c_str());
+      // fprintf(f,"_version 2.2\n");
+      // fprintf(f,"_type %s\n",type.c_str());
 
       for(list<PolymakeProperty>::const_iterator i=properties.begin();i!=properties.end();i++)
@@ -200 +200 @@
   else
     {
-      file << "_application " << application << endl;
-      file << "_version 2.2\n";
-      file << "_type " << type << endl;
+      // file << "_application " << application << endl;
+      // file << "_version 2.2\n";
+      // file << "_type " << type << endl;
 
       for(list<PolymakeProperty>::const_iterator i=properties.begin();i!=properties.end();i++)

gfanlib/gfanlib_symmetriccomplex.cpp

@@ -366 +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
 {
@@ -526 +539 @@
     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());
 

gfanlib/gfanlib_symmetriccomplex.h

@@ -87 +87 @@
   void buildConeLists(bool onlyMaximal, bool compressed, std::vector<std::vector<IntVector > >*conelist/*, ZMatrix *multiplicities*/)const;
   std::string toStringJustCones(int dimLow, int dimHigh, bool onlyMaximal, bool group, std::ostream *multiplicities=0, bool compressed=false, bool tPlaneSort=false)const;
+  std::string toStringJustRaysAndMaximalCones(int flags=0)const;
   std::string toString(int flags=0)const;
   bool isSimplicial()const;

gfanlib/gfanlib_zfan.cpp

@@ -294 +294 @@
   int ZFan::getLinealityDimension()const
   {
-    ensureComplex();
-    // if(complex)
+    if(complex)
       return complex->getLinDim();
-    // if(coneCollection)
-    //   return coneCollection->dimensionOfLinealitySpace();
+    if(coneCollection)
+      return coneCollection->dimensionOfLinealitySpace();
     assert(0);
     return 0;
@@ -364 +363 @@
 }
 
+std::string ZFan::toStringJustRaysAndMaximalCones(int flags)const
+{
+  ensureComplex();
+  return complex->toStringJustRaysAndMaximalCones(flags);
+}
+
 /*int ZFan::getAmbientDimension()const
 {

gfanlib/gfanlib_zfan.h

@@ -105 +105 @@
    */
   std::string toString(int flags=0)const;
+  std::string toStringJustRaysAndMaximalCones(int flags=0)const;
   /**
    * Returns the dimension of the ambient space.