Changeset d6a97c3 in git


Ignore:
Timestamp:
Apr 11, 2011, 3:17:12 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
2ad10e9bccb45c1c7d3c33a6cd3de52209778816
Parents:
40d064981b228dd3692e8e17e5a065cfba2599a2
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-11 15:17:12+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:22+01:00
Message:
FIX: the rest of NC-related stuff can be compiled in now
Location:
libpolys/polys
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • libpolys/polys/Makefile.am

    r40d0649 rd6a97c3  
    3535        templates/p_Procs_Lib.cc \
    3636        polys0.cc prCopy.cc \
    37         nc/sca.cc nc/gring.cc \
     37        nc/gring.cc nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc \
    3838        kbuckets.cc sbuckets.cc ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} weight.cc
    3939

  • libpolys/polys/nc/gring.cc

    r40d0649 rd6a97c3  
    2424
    2525# define PLURAL_INTERNAL_DECLARATIONS
    26 #include <polys/nc/nc.h>
    27 #include <polys/nc/sca.h>
     26#include "nc/nc.h"
     27#include "nc/sca.h"
    2828
    2929#include <coeffs/numbers.h>
    30 #include <polys/coeffrings.h>
     30#include "coeffrings.h"
    3131
    3232// #include <polys/febase.h>
    3333#include <misc/options.h>
    34 #include <polys/monomials/ring.h>
    35 #include <polys/monomials/p_polys.h>
    36 
    37 #include <polys/simpleideals.h>
    38 #include <polys/matpol.h>
    39 
    40 #include <polys/kbuckets.h>
    41 #include <polys/sbuckets.h>
     34
     35#include "monomials/ring.h"
     36#include "monomials/p_polys.h"
     37
     38#include "simpleideals.h"
     39#include "matpol.h"
     40
     41#include "kbuckets.h"
     42#include "sbuckets.h"
    4243
    4344// #include <polys/kstd1.h>
    44 #include <polys/prCopy.h>
    45 
    46 #include <polys/operations/p_Mult_q.h>
     45#include "prCopy.h"
     46
     47#include "operations/p_Mult_q.h"
    4748// dirty tricks:
    48 #include <polys/templates/p_MemAdd.h>
     49#include "templates/p_MemAdd.h"
    4950
    5051// #include <polys/pInline1.h>
    … …  
    5253
    5354
    54 #include <polys/nc/summator.h>
    55 
    56 #include <polys/nc/ncSAMult.h> // for CMultiplier etc classes
    57 #include <polys/nc/ncSAFormula.h> // for CFormulaPowerMultiplier and enum Enum_ncSAType
     55#include "nc/summator.h"
     56
     57#include "nc/ncSAMult.h" // for CMultiplier etc classes
     58#include "nc/ncSAFormula.h" // for CFormulaPowerMultiplier and enum Enum_ncSAType
    5859
    5960// #ifdef HAVE_RATGRING

  • libpolys/polys/nc/gring.h

    r40d0649 rd6a97c3  
    159159
    160160
    161 // inline const nc_struct* GetNC() const { return GetBasering()->GetNC(); }
    162 
    163 
    164 // read only access to NC matrices C/D:
    165 // get C_{i,j}, 1 <= row = i < j = col <= N
    166 inline poly GetC( const ring r, int i, int j )
    167 {
    168   assume(r!= NULL && rIsPluralRing(r));
    169   const matrix C = GetNC(r)->C;
    170   assume(C != NULL);
    171   const int ncols = C->ncols;
    172   assume( (i > 0) && (i < j) && (j <= ncols) );
    173   return ( C->m[ncols * ((i)-1) + (j)-1] );
    174 }
    175 
    176 // get D_{i,j}, 1 <= row = i < j = col <= N
    177 inline poly GetD( const ring r, int i, int j )
    178 {
    179   assume(r!= NULL && rIsPluralRing(r));
    180   const matrix D = GetNC(r)->D;
    181   assume(D != NULL);
    182   const int ncols = D->ncols;
    183   assume( (i > 0) && (i < j) && (j <= ncols) );
    184   return ( D->m[ncols * ((i)-1) + (j)-1] );
    185 }
    186 
    187 
    188161#ifdef PLURAL_INTERNAL_DECLARATIONS
    189162

  • libpolys/polys/nc/nc.h

    r40d0649 rd6a97c3  
    369369
    370370
    371 
     371#ifdef PLURAL_INTERNAL_DECLARATIONS
     372
     373#include <polys/matpol.h>
     374
     375// read only access to NC matrices C/D:
     376// get C_{i,j}, 1 <= row = i < j = col <= N
     377static inline poly GetC( const ring r, int i, int j )
     378{
     379  assume(r!= NULL && rIsPluralRing(r));
     380  const matrix C = GetNC(r)->C;
     381  assume(C != NULL);
     382  const int ncols = C->ncols;
     383  assume( (i > 0) && (i < j) && (j <= ncols) );
     384  return ( C->m[ncols * ((i)-1) + (j)-1] );
     385}
     386
     387// get D_{i,j}, 1 <= row = i < j = col <= N
     388static inline poly GetD( const ring r, int i, int j )
     389{
     390  assume(r!= NULL && rIsPluralRing(r));
     391  const matrix D = GetNC(r)->D;
     392  assume(D != NULL);
     393  const int ncols = D->ncols;
     394  assume( (i > 0) && (i < j) && (j <= ncols) );
     395  return ( D->m[ncols * ((i)-1) + (j)-1] );
     396}
     397
     398#endif /* PLURAL_INTERNAL_DECLARATIONS */
    372399
    373400#endif /* HAVE_PLURAL */

  • libpolys/polys/nc/ncSACache.cc

    r40d0649 rd6a97c3  
    1919
    2020
    21 #include <kernel/mod2.h>
     21#include "config.h"
     22#include <misc/auxiliary.h>
    2223
    2324#ifndef NDEBUG
    … …  
    3233}
    3334
    34 #include <kernel/ring.h>
    35 #include <kernel/p_polys.h>
     35#include <coeffs/numbers.h>
     36#include "coeffrings.h"
    3637
    37 #include <kernel/ncSACache.h> // for CCacheHash etc classes
     38#include "nc/ncSACache.h" // for CCacheHash etc classes
     39
     40#include "monomials/ring.h"
     41#include "monomials/p_polys.h"
     42
    3843
    3944

  • libpolys/polys/nc/ncSAFormula.cc

    r40d0649 rd6a97c3  
    1919
    2020
    21 #include <kernel/mod2.h>
     21#include "config.h"
     22#include <misc/auxiliary.h>
    2223
    2324#ifdef HAVE_PLURAL
     25
     26#define PLURAL_INTERNAL_DECLARATIONS
    2427
    2528#ifndef NDEBUG
    … …  
    2932#endif
    3033
    31 
    32 #include <ncSAFormula.h> // for CFormulaPowerMultiplier
    33 
    34 #include <ring.h>
    35 #include <p_polys.h>
    36 #include <febase.h>
    37 #include <sca.h> // for SCA
    38 #include <polys.h> // for p_One
     34#include <reporter/reporter.h>
     35
     36#include <coeffs/numbers.h>
     37#include "coeffrings.h"
     38
     39#include "nc/ncSAFormula.h"
     40// for CFormulaPowerMultiplier
     41
     42#include "monomials/ring.h"
     43#include "monomials/p_polys.h"
     44
     45#include "nc/sca.h"
    3946
    4047

  • libpolys/polys/nc/ncSAFormula.h

    r40d0649 rd6a97c3  
    1212
    1313#include <polys/monomials/ring.h>
     14#include <polys/nc/nc.h>
    1415
    1516bool ncInitSpecialPowersMultiplication(ring r);
    … …  
    2526  _ncSA_1xy0x0yG = 30 // Weyl 
    2627};
    27 
    28 
    29 inline CFormulaPowerMultiplier* GetFormulaPowerMultiplier(const ring r)
    30 {
    31   return r->GetNC()->GetFormulaPowerMultiplier();
    32 }
    3328
    3429class CFormulaPowerMultiplier
    … …  
    9792
    9893
     94static inline CFormulaPowerMultiplier* GetFormulaPowerMultiplier(const ring r)
     95{
     96  return r->GetNC()->GetFormulaPowerMultiplier();
     97}
     98
    9999
    100100

  • libpolys/polys/nc/sca.cc

    r40d0649 rd6a97c3  
    2727// for
    2828#define PLURAL_INTERNAL_DECLARATIONS
     29
    2930#include <polys/nc/sca.h>
    3031#include <polys/nc/nc.h>
    … …  
    4748
    4849#include <polys/monomials/ring.h>
    49 #include <polys/matpol.h>
    5050#include <polys/kbuckets.h>
    5151// #include <polys/kstd1.h>

  • libpolys/polys/nc/summator.cc

    r40d0649 rd6a97c3  
    1919#endif
    2020
    21 #include <kernel/mod2.h>
     21#include "config.h"
     22#include <misc/auxiliary.h>
     23
    2224#ifdef HAVE_PLURAL
    23 #include <kernel/summator.h>
    24 #include <kernel/options.h>
    25 #include <kernel/ring.h>
    26 #include <kernel/p_polys.h>
    27 #include <kernel/sbuckets.h>
     25#include <misc/options.h>
     26
     27#include "nc/summator.h"
     28#include "monomials/ring.h"
     29#include "monomials/p_polys.h"
     30
     31#include "sbuckets.h"
    2832
    2933
Note: See TracChangeset for help on using the changeset viewer.