Changeset 42ddd0 in git


Ignore:
Timestamp:
Feb 13, 2006, 8:52:32 PM (18 years ago)
Author:
Michael Brickenstein <bricken@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
b636f01484c48d2f7dd0e3a9a4ff02434d40caf1
Parents:
924ccae622403cc293c01a328e2645f0bb90d465
Message:
*bricken: possible to compile without HAVE_COEF_BUCKETS


git-svn-id: file:///usr/local/Singular/svn/trunk@8939 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/kbuckets.cc

    r924cca r42ddd0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kbuckets.cc,v 1.24 2006-02-13 17:12:28 bricken Exp $ */
     4/* $Id: kbuckets.cc,v 1.25 2006-02-13 19:52:26 bricken Exp $ */
    55
    66#include "mod2.h"
     
    107107BOOLEAN kbTest(kBucket_pt bucket)
    108108{
     109  #ifdef HAVE_COEF_BUCKETS
    109110  assume(bucket->coef[0]==NULL);
     111  #endif
    110112  int i;
    111113  poly lm = bucket->buckets[0];
     
    158160      }
    159161    }
     162    #ifdef HAVE_COEF_BUCKETS
    160163    if (bucket->coef[i]!=NULL)
    161164    {
     
    170173      }
    171174    }
     175    #endif
    172176  }
    173177  return TRUE;
     
    208212  for (i=0; i<= bucket->buckets_used; i++)
    209213  {
     214
    210215    if (bucket->buckets[i] != NULL)
    211216    {
     
    309314  {
    310315    if (bucket->buckets[i] != NULL) return FALSE;
     316    #ifdef HAVE_COEF_BUCKETS
    311317    if (bucket->coef[i] != NULL) return FALSE;
     318    #endif
    312319    if (bucket->buckets_length[i] != 0) return FALSE;
    313320  }
     
    328335
    329336  bucket->buckets[0] = lm;
     337  #ifdef HAVE_COEF_BUCKETS
    330338  assume(bucket->coef[0]==NULL);
     339  #endif
     340  #ifdef USE_COEF_BUCKETS
    331341  bucket->coef[0]=NULL;
     342  #endif
    332343  if (lm!=NULL)
    333344    bucket->buckets_length[0] = 1;
     
    387398    bucket->buckets_length[i] = 0;
    388399  }
     400  #ifdef HAVE_COEF_BUCKETS
    389401  assume(bucket->coef[0]==NULL);
     402  #endif
    390403  lm = bucket->buckets[0];
    391404  if (lm != NULL)
     
    946959    n_Delete(&n,r);
    947960  }
    948   #endif
     961 
    949962  if ((p1==NULL) && (bucket->coef[i]!=NULL))
    950963    p_Delete(&bucket->coef[i],r);
     964#endif
    951965  bucket->buckets_length[i]=l1;
    952966  if (i >= bucket->buckets_used)
     
    11651179void kBucketSimpleContent(kBucket_pt bucket)
    11661180{
     1181  #ifdef USE_COEF_BUCKETS
    11671182  ring r=bucket->bucket_ring;
    11681183  int i;
     
    12401255  }
    12411256  n_Delete(&coef,r);
     1257  #endif
    12421258}
    12431259
     
    12501266  poly p=bucket->buckets[i];
    12511267  bucket->buckets_length[i]--;
     1268#ifdef USE_COEF_BUCKETS
    12521269  if (bucket->coef[i]!=NULL)
    12531270  {
     
    12711288  }
    12721289  else
     1290#endif
    12731291  {
    12741292    bucket->buckets[i]=pNext(bucket->buckets[i]);
  • kernel/kbuckets.h

    r924cca r42ddd0  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kbuckets.h,v 1.5 2006-01-13 18:10:04 wienand Exp $ */
     6/* $Id: kbuckets.h,v 1.6 2006-02-13 19:52:32 bricken Exp $ */
    77#include "structs.h"
    88#include "p_Procs.h"
    99#include "pShallowCopyDelete.h"
    1010
    11 #define HAVE_COEF_BUCKETS
     11//#define HAVE_COEF_BUCKETS
    1212
    1313/////////////////////////////////////////////////////////////////////////
     
    212212inline const poly kBucketGetLm(kBucket_pt bucket)
    213213{
     214  #ifdef   HAVE_COEF_BUCKETS
    214215  assume(bucket->coef[0]==NULL);
     216  #endif
    215217  if (bucket->buckets[0] == NULL)
    216218    bucket->bucket_ring->p_Procs->p_kBucketSetLm(bucket);
     219  #ifdef  HAVE_COEF_BUCKETS
    217220  assume(bucket->coef[0]==NULL);
     221  #endif
    218222  return bucket->buckets[0];
    219223}
     
    222226{
    223227  poly lm = kBucketGetLm(bucket);
     228  #ifdef   HAVE_COEF_BUCKETS
    224229  assume(bucket->coef[0]==NULL);
     230  #endif
    225231  bucket->buckets[0] = NULL;
    226232  bucket->buckets_length[0] = 0;
Note: See TracChangeset for help on using the changeset viewer.