Changeset e543dd in git

Timestamp:

Apr 6, 2011, 5:26:53 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6f1774bebfc5b4528c0d9586e216b4160d0dc8a8

Parents:

f6bfc4760c37e57e10254840047f2c962b9566bb

Message:

new gfanlib from Anders


git-svn-id: file:///usr/local/Singular/svn/trunk@14098 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

gfanlib

Files:

• gfanlib_polyhedralfan.cpp (modified) (4 diffs)
• gfanlib_symmetry.h (modified) (3 diffs)
• gfanlib_zcone.cpp (modified) (2 diffs)
• gfanlib_zcone.h (modified) (2 diffs)
• gfanlib_zfan.cpp (modified) (6 diffs)
• gfanlib_zfan.h (modified) (1 diff)

gfanlib/gfanlib_polyhedralfan.cpp

@@ -308 +308 @@
    * which causes the ordering in which the different orbits appear to change.
    */
-
   if(cones.empty())return ZMatrix(0,n);
 ZMatrix generatorsOfLinealitySpace=cones.begin()->generatorsOfLinealitySpace();//all cones have the same lineality space
+
 
   std::set<ZVector> rays;//(this->getAmbientDimension());
@@ -317 +317 @@
     {
       ZMatrix temp=i->extremeRays(&generatorsOfLinealitySpace);
-      std::cerr<<temp;
+ //     std::cerr<<temp;
       for(int j=0;j<temp.getHeight();j++)
         rays.insert(symmetries.orbitRepresentative(temp[j]));
@@ -490 +490 @@
 
           ZMatrix generatorsOfLinealitySpace=cones.empty()?ZMatrix::identity(getAmbientDimension()):cones.begin()->generatorsOfLinealitySpace();
-          std::cerr<<generatorsOfLinealitySpace;
           SymmetricComplex symCom(rays,generatorsOfLinealitySpace,symmetries);
-
 
           for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++)
@@ -508 +506 @@
           symCom.remap();
 //          log1 cerr<<"Done remapping";
+
           return symCom;
 }

gfanlib/gfanlib_symmetry.h

@@ -27 +27 @@
   static bool isPermutation(IntVector const &a);
   /**
-   * Returns true if all rows of the matrix are pemutations
+   * Returns true if all rows of the matrix contains the elements 0 up to m.getWidth()-1.
    */
   static bool arePermutations(IntMatrix const &m);
@@ -102 +102 @@
 
 class SymmetryGroup{
-//  unsigned char *byteTable;
   int byteTableHeight;
   class Trie *trie;
@@ -142 +141 @@
 
   // Methods for highly optimized symmetry group computations:
-//  void createByteTable();//Can only be called once. SymmetryGroup is not allowed to be changed afterwards or to be copied. Leaks memory at destruction.
   void createTrie();
-//  unsigned char *getByteTable()const;
-//  int getByteTableHeight()const;
 };
 /**

gfanlib/gfanlib_zcone.cpp

@@ -413 +413 @@
         set_addelem(A->linset,i+1);
 
-      A->objective-dd_LPmax;
+      A->objective=dd_LPmax;
       lp=dd_Matrix2LP(A, &err);
       if (err!=dd_NoError) goto _L99;
@@ -717 +717 @@
       equations=QToZMatrixPrimitive(equations2);
     }
-  state=s;
+  if(state<s)
+    state=s;
 }
 

gfanlib/gfanlib_zcone.h

@@ -90 +90 @@
 };
 
+class ZCone;
+ZCone intersection(const ZCone &a, const ZCone &b);
 class ZCone
 {
@@ -349 +351 @@
     friend std::ostream &operator<<(std::ostream &f, ZCone const &c);
 };
-ZCone intersection(const ZCone &a, const ZCone &b);
+
 };
 

gfanlib/gfanlib_zfan.cpp

@@ -57 +57 @@
         assert(coneCollection);
         complex = new SymmetricComplex(coneCollection->toSymmetricComplex());
-        std::cerr<<"D"<<std::endl;
         complex->buildConeLists(false,false,&cones);
-        std::cerr<<"D"<<std::endl;
         complex->buildConeLists(true,false,&maximalCones);
-        std::cerr<<"D"<<std::endl;
         complex->buildConeLists(false,true,&coneOrbits);
-        std::cerr<<"D"<<std::endl;
         complex->buildConeLists(true,true,&maximalConeOrbits);
-        std::cerr<<"D"<<std::endl;
-      }
-  }
+      }
+  }
+  void ZFan::killComplex()const
+  {
+    if(complex)
+      {
+        delete complex;
+        complex=0;
+      }
+  }
+
   ZFan::ZFan(std::istream &f):
     coneCollection(0),
@@ -213 +217 @@
     if(this!=&f)
       {
-std::cerr<<"COPYING\n";
         if(complex)
           {
@@ -219 +222 @@
             complex=0;
           }
-        std::cerr<<"1COPYING\n";
         if(coneCollection)
           {
@@ -225 +227 @@
             coneCollection=0;
           }
-        std::cerr<<"2COPYING\n";
         if(f.coneCollection)
           {
             coneCollection=new PolyhedralFan(*f.coneCollection);
           }
-        std::cerr<<"3COPYING\n";
         if(f.complex)
           {
             complex=new SymmetricComplex(*f.complex);
           }
-        std::cerr<<"DONE COPYING\n";
       }
     return *this;
@@ -273 +272 @@
   {
     ensureConeCollection();
+    killComplex();
     coneCollection->insert(c);
   }
@@ -291 +291 @@
 {
   ensureComplex();
+
+  //  std::string s=complex->toString(flags);
+//  killComplex();
+//  return s;//complex->getMinDim(),complex->getMaxDim(),0,0);
   return complex->toString(flags);//complex->getMinDim(),complex->getMaxDim(),0,0);
 //  return "NEEDTOFIXTHIS";

gfanlib/gfanlib_zfan.h

@@ -58 +58 @@
   void ensureConeCollection()const;
   void ensureComplex()const;
+  void killComplex()const;
   std::vector<std::vector<IntVector> > &table(bool orbit, bool maximal)const;
 public: