Changeset c6e80e in git


Ignore:
Timestamp:
Jul 19, 2011, 5:39:14 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
f478f5beee78cd910479115b993cc9e7b02b82a8
Parents:
a2174ab573b7b58a5ee6a6c293035fc8ecbd45ab
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:39:14+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:42+01:00
Message:
FIX: kInline.cc should be a header: kInline.h
ADD: nGcd/pDeg can be used with and without ring argument
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • kernel/Makefile.in

    ra2174a rc6e80e  
    150150        p_Merge_q__T.cc pp_Mult_mm_Noether__T.cc\
    151151        p_kBucketSetLm__T.cc \
    152         kInline.cc
     152        kInline.h
    153153
    154154HEADERS=hutil.h idrec.h stairc.h ideals.h \
     
    278278        -${MKINSTALLDIRS} ${includedir}
    279279        -${MKINSTALLDIRS} ${includedir}/singular
    280         -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
     280        -for file in *.h kInline.h; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
    281281
    282282install: all installbin
  • kernel/kInline.h

    ra2174a rc6e80e  
    33****************************************/
    44/***************************************************************
    5  *  File:    kInline.cc
     5 *  File:    kInline.h
    66 *  Purpose: implementation of std related inline routines
    77 *  Author:  obachman (Olaf Bachmann)
  • kernel/kstd1.cc

    ra2174a rc6e80e  
    1515#define MORA_USE_BUCKETS
    1616
    17 #include <kernel/mod2.h>
    18 #include <omalloc/omalloc.h>
    19 
    2017#ifndef NDEBUG
    2118# define MYTEST 0
     
    2421#endif /* ifndef NDEBUG */
    2522
     23
     24#include "mod2.h"
     25
     26#include <omalloc/omalloc.h>
     27#include <misc/options.h>
     28#include <misc/intvec.h>
     29
    2630#if MYTEST
    2731#ifdef HAVE_TAIL_RING
     
    3034#endif /* if MYTEST */
    3135
    32 #include <misc/options.h>
     36#include <polys/weight.h>
     37#include <polys/polys.h>
     38
    3339#include <kernel/kutil.h>
    34 #include <kernel/kInline.cc>
    35 #include <polys/polys.h>
    3640#include <kernel/febase.h>
    3741#include <kernel/kstd1.h>
    3842#include <kernel/khstd.h>
    3943#include <kernel/stairc.h>
    40 #include <polys/weight.h>
    4144//#include "cntrlc.h"
    42 #include <misc/intvec.h>
    4345#include <kernel/ideals.h>
    4446//#include "../Singular/ipid.h"
     
    4850
    4951#ifdef HAVE_PLURAL
     52#include <polys/nc/nc.h>
    5053#include <polys/nc/sca.h>
    5154#endif
     55
     56#include <kernel/kInline.h>
    5257
    5358
     
    16901695long kModDeg(poly p, ring r)
    16911696{
    1692   long o=pWDegree(p, r);
     1697  long o=p_WDegree(p, r);
    16931698  long i=p_GetComp(p, r);
    16941699  if (i==0) return o;
  • kernel/kutil.h

    ra2174a rc6e80e  
    1111
    1212#include <string.h>
    13 #include <omalloc/mylimits.h>
     13
     14#include <omalloc/omalloc.h>
     15#include <misc/mylimits.h>
     16
     17
     18#include <polys/polys.h>
     19#include <polys/operations/pShallowCopyDelete.h>
    1420
    1521#include <kernel/structs.h>
    16 #include <omalloc/omalloc.h>
    17 #include <polys/monomials/ring.h>
    18 #include <kernel/structs.h>
    19 #include <polys/operations/pShallowCopyDelete.h>
    2022
    2123#if 1
     
    641643  kStrategy strat);
    642644
    643 //// #include <kernel/kInline.cc> // This is really ugly!!!
     645#include <kernel/kInline.h>
    644646
    645647/* shiftgb stuff */
  • kernel/makefile

    ra2174a rc6e80e  
    9393
    9494SOURCES=${CSOURCES} ${CXXSOURCES} \
    95         kInline.cc
     95        kInline.h
    9696
    9797HEADERS=hutil.h idrec.h stairc.h ideals.h \
     
    150150        -${MKINSTALLDIRS} ${includedir}
    151151        -${MKINSTALLDIRS} ${includedir}/singular
    152         -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
     152        -for file in *.h kInline.h; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
    153153
    154154install: all installbin
  • kernel/shiftgb.cc

    ra2174a rc6e80e  
    2828#include <misc/intvec.h>
    2929#include <kernel/structs.h>
    30 #include <kernel/kInline.cc>
     30#include <kernel/kInline.h>
    3131#include <kernel/stairc.h>
    3232#include <polys/weight.h>
  • kernel/test.cc

    ra2174a rc6e80e  
    261261#include "int64vec.cc"
    262262#include "khstd.cc"
    263 #include "kInline.cc"
     263#include "kInline.h"
    264264#include "kpolys.cc"
    265265#include "kspoly.cc"
  • libpolys/coeffs/numbers.h

    ra2174a rc6e80e  
    3030#define nWrite(n)         n_Write(n,currRing->cf)
    3131#define nNormalize(n)     n_Normalize(n,currRing->cf)
    32 #define nGcd(a, b)        n_Gcd(a,b,currRing->cf)
     32
     33inline number nGcd(number a, number b, const ring r = currRing) { return n_Gcd(a, b, r->cf); }
     34inline number nGcd(number a, number b, const coeffs cf) { return n_Gcd(a, b, cf); }
     35
    3336#define nIntDiv(a, b)     n_IntDiv(a,b,currRing->cf)
    3437#define nDiv(a, b)        n_Div(a,b,currRing->cf)
  • libpolys/polys/polys.h

    ra2174a rc6e80e  
    244244 *
    245245 ***************************************************************/
    246 inline int pWeight(int i, const ring R = currRing){ return p_Weight(i,R); }
    247 
    248 #define pDeg(p)    p_Deg(p,currRing)
     246inline int pWeight(int i, const ring R = currRing){ return p_Weight(i, R); }
     247inline long pDeg(poly p, const ring R = currRing) { return p_Deg(p, R); }
     248 
     249
    249250static inline long pTotaldegree(poly p) { return p_Totaldegree(p,currRing); }
    250251#define pWTotaldegree(p) p_WTotaldegree(p,currRing)
Note: See TracChangeset for help on using the changeset viewer.