Changeset 4b7049 in git

Timestamp:

Jun 8, 2006, 8:07:06 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

9cf06bf5bb055050a3eb4ad285a06b788c79823c

Parents:

8dee806bede9bf5ad46984badc31c4ca67932402

Message:

*bricken: std::vector<bool>


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

Files:

• Singular/claptmpl.cc (modified) (2 diffs)
• kernel/tgb.cc (modified) (5 diffs)
• kernel/tgb_internal.h (modified) (4 diffs)

Singular/claptmpl.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: claptmpl.cc,v 1.32 2006-02-23 12:39:35 bricken Exp $
+// $Id: claptmpl.cc,v 1.33 2006-06-08 06:07:06 bricken Exp $
 /*
 * ABSTRACT - instantiation of all templates
@@ -210 +210 @@
 template class dynamic_bitset<>;
 template class vector<dynamic_bitset<> >;
+#else
+#include <vector>
+using std::vector;
+template class vector<bool>;
+template class vector<vector<bool> >;
 #endif
 

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.93 2006-05-19 12:50:50 bricken Exp $ */
+/* $Id: tgb.cc,v 1.94 2006-06-08 06:06:51 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1177 +1177 @@
     ENLARGE(c->lengths,int);
     #ifndef HAVE_BOOST
+    #ifndef USE_STDVECBOOL
+    
     ENLARGE(c->states, char*);
+    #endif
     #endif
     ENLARGE(c->gcd_of_terms,poly);
@@ -1220 +1223 @@
 
   #else
+  #ifdef USE_STDVECBOOL
+    
+    c->states.push_back(vector<bool>(i));
+   
+  
+  #else
   if (i>0)
     c->states[i]=(char*)  omalloc(i*sizeof(char));
   else
     c->states[i]=NULL;
+  #endif
   #endif
 
@@ -2176 +2186 @@
   /* omUnGetSpecBin(&(c->HeadBin)); */
   #ifndef HAVE_BOOST
+  #ifdef USE_STDVECBOOL
+  #else
   h=omalloc(n*sizeof(char*));
 
   states=(char**) h;
+  #endif
   #endif
   h=omalloc(n*sizeof(int));
@@ -2321 +2334 @@
   }
   #ifndef HAVE_BOOST
+  #ifndef USE_STDVECBOOL
   for(int z=1 /* zero length at 0 */;z<c->n;z++){
     omfree(c->states[z]);
   }
   omfree(c->states);
+  #endif
   #endif
 

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.40 2006-05-19 10:30:47 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.41 2006-06-08 06:06:51 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -19 +19 @@
 #include "stdlib.h"
 //#define HAVE_BOOST 1
+#define USE_STDVECBOOL 1
 #ifdef HAVE_BOOST
 #include "boost/dynamic_bitset.hpp"
@@ -25 +26 @@
 using std::vector;
 #endif
-
-
+#ifdef USE_STDVECBOOL
+#include <vector>
+using std::vector;
+#endif
 #include "kutil.h"
 #include "kInline.cc"
@@ -96 +99 @@
     slimgb_alg(ideal I, int syz_comp,BOOLEAN F4);
     virtual ~slimgb_alg();
-  #ifndef HAVE_BOOST
+#ifndef HAVE_BOOST
+#ifdef USE_STDVECBOOL
+  vector<vector<bool> > states;
+#else
   char** states;
-  #else
+#endif
+#else
   vector<dynamic_bitset<> > states;
-  #endif
+#endif
   ideal add_later;
   ideal S;