Changeset daeaac in git

Timestamp:

Oct 29, 2018, 1:37:23 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7d2091affbf4b4a1a382e5eb0a47f66c0f3c42f7

Parents:

f8266555777b8a5e937c45e7a1aa0d870df16b17b5f5decc18fe2b47fd388dbd9c10937f49fa2d7e

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

Files:

• doc/NEWS.texi (modified) (1 diff)
• gfanlib/Makefile.am (modified) (1 diff)
• gfanlib/gfanlib_circuittableint.h (modified) (2 diffs)
• gfanlib/gfanlib_paralleltraverser.h (modified) (1 diff)
• gfanlib/gfanlib_q.h (modified) (1 diff)
• gfanlib/gfanlib_z.h (modified) (1 diff)
• gfanlib/gfanlib_zcone.cpp (modified) (1 diff)
• gfanlib/gfanlib_zfan.cpp (modified) (3 diffs)

doc/NEWS.texi

@@ -46 +46 @@
 @item extended @code{coef} to ideals (@nref{coef}).
 @item error and signal handling in @code{libSingular} (@nref{libSingular}).
+@item updated gfanlib to version 0.6.2
 @end itemize
 

gfanlib/Makefile.am

@@ -17 +17 @@
 SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
 libgfan_la_SOURCES = $(SOURCES)
-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS)
+libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) -release ${PACKAGE_VERSION}
 
 libgfan_includedir =$(includedir)/gfanlib

gfanlib/gfanlib_circuittableint.h

@@ -41 +41 @@
                         v=a.v;
                         shift=0;
-                        uint32_t t=v;
+                        int32_t t=v;
+//                        uint32_t t=v;
                         assert(t);
                         while(!(t&1)){t>>=        1;shift++;}
@@ -111 +112 @@
         }
         std::string toString()const{std::stringstream s;s<<v;return s.str();}
+        friend std::ostream &operator<<(std::ostream &f, CircuitTableInt32 const &a){f<<(int)a.v;return f;}
         Double extend()const{Double ret;ret.v=v;return ret;}
         CircuitTableInt32 &maddWithOverflowChecking(CircuitTableInt32 const &a, CircuitTableInt32 const&b){Double t=this->extend();t+=extendedMultiplication(a,b);*this=t.castToSingle();return *this;}

gfanlib/gfanlib_paralleltraverser.h

@@ -27 +27 @@
 {
 public:
-        bool aborting;                      // Added by Anders
+        bool aborting;                                         // Added by Anders
         void abort(){aborting=true;}        // Added by Anders
-        Traverser():aborting(false){}       // Added by Anders
+        Traverser():aborting(false){}        // Added by Anders
   // Virtual destructor
   virtual ~Traverser( void ) {};

gfanlib/gfanlib_q.h

@@ -12 +12 @@
 #include <ostream>
 #include <assert.h>
-#include <stddef.h>
 #include "gmp.h"
 

gfanlib/gfanlib_z.h

@@ -14 +14 @@
 #define OLD 1
 #if OLD
-#include <stddef.h>
 #include "gmp.h"
 

gfanlib/gfanlib_zcone.cpp

@@ -37 +37 @@
         void initializeCddlibIfRequired() // calling this frequently will cause memory leaks because deinitialisation is not possible with old versions of cddlib.
         {
-          if (dd_statStartTime==0)
-          {
+          if (dd_statStartTime==0)
+          {
                 dd_set_global_constants();
           }

gfanlib/gfanlib_zfan.cpp

@@ -282 +282 @@
     if(coneCollection)
     {
-      if(coneCollection->isEmpty())
-        return -1;
-      return coneCollection->getAmbientDimension()-coneCollection->getMaxDimension();
+            if(coneCollection->isEmpty())
+                    return -1;
+            else
+                    return coneCollection->getAmbientDimension()-coneCollection->getMaxDimension();
     }
     assert(0);
@@ -295 +296 @@
     if(coneCollection)
     {
-      if(coneCollection->isEmpty())
-        return -1;
-      return coneCollection->getMaxDimension();
+            if(coneCollection->isEmpty())
+                    return -1;
+            else
+                    return coneCollection->getMaxDimension();
     }
     assert(0);
@@ -307 +309 @@
       return complex->getLinDim();
     if(coneCollection)
-      return coneCollection->dimensionOfLinealitySpace();
+    {
+            if(coneCollection->isEmpty())
+                    return getAmbientDimension();
+            else
+                    return coneCollection->dimensionOfLinealitySpace();
+    }
     assert(0);
     return 0;