Changeset f82665 in git for gfanlib

Timestamp:

Oct 29, 2018, 1:28:18 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

daeaac1ed0f0ea9b041977a1b0f3e7edc96c10e3

Parents:

fadf5bd30a2a40cf580cfb666b0a2dfc5d7b9d42

Message:

update gfanlib to 0.6.2

Location:

gfanlib

Files:

• gfanlib_circuittableint.h (modified) (2 diffs)
• gfanlib_paralleltraverser.h (modified) (1 diff)
• gfanlib_q.h (modified) (1 diff)
• gfanlib_z.h (modified) (1 diff)
• gfanlib_zcone.cpp (modified) (1 diff)
• gfanlib_zfan.cpp (modified) (3 diffs)

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;