Changeset 4b7049 in git


Ignore:
Timestamp:
Jun 8, 2006, 8:07:06 AM (18 years ago)
Author:
Michael Brickenstein <bricken@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
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:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/claptmpl.cc

    r8dee80 r4b7049  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: claptmpl.cc,v 1.32 2006-02-23 12:39:35 bricken Exp $
     5// $Id: claptmpl.cc,v 1.33 2006-06-08 06:07:06 bricken Exp $
    66/*
    77* ABSTRACT - instantiation of all templates
     
    210210template class dynamic_bitset<>;
    211211template class vector<dynamic_bitset<> >;
     212#else
     213#include <vector>
     214using std::vector;
     215template class vector<bool>;
     216template class vector<vector<bool> >;
    212217#endif
    213218
  • kernel/tgb.cc

    r8dee80 r4b7049  
    55*  Computer Algebra System SINGULAR     *
    66****************************************/
    7 /* $Id: tgb.cc,v 1.93 2006-05-19 12:50:50 bricken Exp $ */
     7/* $Id: tgb.cc,v 1.94 2006-06-08 06:06:51 bricken Exp $ */
    88/*
    99* ABSTRACT: slimgb and F4 implementation
     
    11771177    ENLARGE(c->lengths,int);
    11781178    #ifndef HAVE_BOOST
     1179    #ifndef USE_STDVECBOOL
     1180   
    11791181    ENLARGE(c->states, char*);
     1182    #endif
    11801183    #endif
    11811184    ENLARGE(c->gcd_of_terms,poly);
     
    12201223
    12211224  #else
     1225  #ifdef USE_STDVECBOOL
     1226   
     1227    c->states.push_back(vector<bool>(i));
     1228   
     1229 
     1230  #else
    12221231  if (i>0)
    12231232    c->states[i]=(char*)  omalloc(i*sizeof(char));
    12241233  else
    12251234    c->states[i]=NULL;
     1235  #endif
    12261236  #endif
    12271237
     
    21762186  /* omUnGetSpecBin(&(c->HeadBin)); */
    21772187  #ifndef HAVE_BOOST
     2188  #ifdef USE_STDVECBOOL
     2189  #else
    21782190  h=omalloc(n*sizeof(char*));
    21792191
    21802192  states=(char**) h;
     2193  #endif
    21812194  #endif
    21822195  h=omalloc(n*sizeof(int));
     
    23212334  }
    23222335  #ifndef HAVE_BOOST
     2336  #ifndef USE_STDVECBOOL
    23232337  for(int z=1 /* zero length at 0 */;z<c->n;z++){
    23242338    omfree(c->states[z]);
    23252339  }
    23262340  omfree(c->states);
     2341  #endif
    23272342  #endif
    23282343
  • kernel/tgb_internal.h

    r8dee80 r4b7049  
    55*  Computer Algebra System SINGULAR     *
    66****************************************/
    7 /* $Id: tgb_internal.h,v 1.40 2006-05-19 10:30:47 bricken Exp $ */
     7/* $Id: tgb_internal.h,v 1.41 2006-06-08 06:06:51 bricken Exp $ */
    88/*
    99 * ABSTRACT: tgb internal .h file
     
    1919#include "stdlib.h"
    2020//#define HAVE_BOOST 1
     21#define USE_STDVECBOOL 1
    2122#ifdef HAVE_BOOST
    2223#include "boost/dynamic_bitset.hpp"
     
    2526using std::vector;
    2627#endif
    27 
    28 
     28#ifdef USE_STDVECBOOL
     29#include <vector>
     30using std::vector;
     31#endif
    2932#include "kutil.h"
    3033#include "kInline.cc"
     
    9699    slimgb_alg(ideal I, int syz_comp,BOOLEAN F4);
    97100    virtual ~slimgb_alg();
    98   #ifndef HAVE_BOOST
     101#ifndef HAVE_BOOST
     102#ifdef USE_STDVECBOOL
     103  vector<vector<bool> > states;
     104#else
    99105  char** states;
    100   #else
     106#endif
     107#else
    101108  vector<dynamic_bitset<> > states;
    102   #endif
     109#endif
    103110  ideal add_later;
    104111  ideal S;
Note: See TracChangeset for help on using the changeset viewer.