Changeset f7a975 in git


Ignore:
Timestamp:
Apr 8, 2011, 12:13:42 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
9959c4523c38de5512e2a1bcc348be2677981317
Parents:
4021bbf45258a9c11212461e6d5de35fed6c4aac
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-08 12:13:42+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:21+01:00
Message:
moved simple ideal stuff to simpleideals.h
renamed ideals.cc to simpleideals.cc (needs to be cleaned)
fixed #includes for ideals.h
Location:
libpolys/polys
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • libpolys/polys/ext_fields/longalg.cc

    r4021bb rf7a975  
    1717#include <coeffs/numbers.h>
    1818#include <polys/polys.h>
    19 #include <polys/ideals.h>
     19#include <polys/simpleideals.h>
    2020#include <polys/monomials/ring.h>
    2121#ifdef HAVE_FACTORY

  • libpolys/polys/ideals.h

    r4021bb rf7a975  
    99*/
    1010// #include <kernel/structs.h>
    11 
    12 #include <polys/monomials/ring.h>
    13 
    14 struct sip_sideal
    15 {
    16   poly*  m;
    17   long rank;
    18   int nrows;
    19   int ncols;
    20   #define IDELEMS(i) ((i)->ncols)
    21   #define MATCOLS(i) ((i)->ncols)
    22   #define MATROWS(i) ((i)->nrows)
    23   #define MATELEM(mat,i,j) ((mat)->m)[MATCOLS((mat)) * ((i)-1) + (j)-1]
    24    
    25 };
    26 
    27 struct sip_smap
    28 {
    29   poly *m;
    30   char *preimage;
    31   int nrows;
    32   int ncols;
    33 };
    34 
    35 class ip_smatrix;
    36 typedef ip_smatrix *       matrix;
    37 
    38 struct sideal_list;
    39 typedef struct sideal_list *      ideal_list;
    40 
    41 struct sideal_list
    42 {
    43   ideal_list next;
    44   ideal      d;
    45 #ifndef NDEBUG
    46   int nr;
    47 #endif
    48 };
    4911
    5012//typedef struct sip_sideal *        ideal;
    … …  
    12486
    12587BOOLEAN idIs0 (ideal h);
    126 
    127 long idRankFreeModule(ideal m, ring lmRing, ring tailRing);
    128 
    129 static inline long idRankFreeModule(ideal m, ring r){ return idRankFreeModule(m, r, r); }
    13088
    13189// returns TRUE, if idRankFreeModule(m) > 0

  • libpolys/polys/kbuckets.cc

    r4021bb rf7a975  
    115115
    116116  omCheckAddrBin(bucket, kBucket_bin);
    117   if (bucket->bucket_ring!=currRing)
    118   {
    119      rTest(bucket->bucket_ring);
    120   }
    121117  assume(bucket->buckets_used <= MAX_BUCKET);
    122118  if (! kbTest_i(bucket, 0)) return FALSE;

  • libpolys/polys/monomials/p_polys.cc

    r4021bb rf7a975  
    2121
    2222#include <polys/weight.h>
    23 #include <polys/ideals.h>
     23#include <polys/simpleideals.h>
    2424
    2525#include <polys/monomials/ring.h>

  • libpolys/polys/monomials/ring.cc

    r4021bb rf7a975  
    2424#include <polys/ext_fields/longtrans.h>
    2525#include <coeffs/ffields.h>
    26 // #include <???/ideals.h>
    2726#include <polys/monomials/ring.h>
    2827#include <polys/monomials/maps.h>
    … …  
    3231
    3332#include <polys/matpol.h>
    34 #include <polys/ideals.h>
    3533
    3634#ifdef HAVE_PLURAL
    … …  
    41284126      Print("  limit %d\n",r->typ[j].data.is.limit);
    41294127      #ifndef NDEBUG
    4130       PrintS("  F: ");idShow(r->typ[j].data.is.F, r, r, 1);
     4128      //PrintS("  F: ");idShow(r->typ[j].data.is.F, r, r, 1);
    41314129      #endif
    41324130
    … …  
    44544452      res->qideal= idrCopyR_NoSort(r->qideal, r, res);
    44554453
    4456       assume(idRankFreeModule(res->qideal, res) == 0);
     4454      assume(id_RankFreeModule(res->qideal, res) == 0);
    44574455
    44584456#ifdef HAVE_PLURAL
    … …  
    44644462
    44654463#endif
    4466       assume(idRankFreeModule(res->qideal, res) == 0);
     4464      assume(id_RankFreeModule(res->qideal, res) == 0);
    44674465    }
    44684466
    … …  
    48674865      res->qideal= idrCopyR_NoSort(r->qideal, r, res);
    48684866
    4869       assume(idRankFreeModule(res->qideal, res) == 0);
     4867      assume(id_RankFreeModule(res->qideal, res) == 0);
    48704868
    48714869#ifdef HAVE_PLURAL
    … …  
    48774875
    48784876#endif
    4879       assume(idRankFreeModule(res->qideal, res) == 0);
     4877      assume(id_RankFreeModule(res->qideal, res) == 0);
    48804878    }
    48814879

  • libpolys/polys/nc/gring.cc

    r4021bb rf7a975  
    2828#include <kernel/polys.h>
    2929#include <kernel/numbers.h>
    30 #include <kernel/ideals.h>
     30#include <polys/simpleideals.h>
    3131#include <kernel/matpol.h>
    3232#include <kernel/kbuckets.h>

  • libpolys/polys/nc/sca.cc

    r4021bb rf7a975  
    3434#include <kernel/p_polys.h>
    3535#include <kernel/kutil.h>
    36 #include <kernel/ideals.h>
     36#include <polys/simpleideals.h>
    3737#include <kernel/intvec.h>
    3838#include <kernel/polys.h>

  • libpolys/polys/operations/p_Mult_q.cc

    r4021bb rf7a975  
    7171  pAssume1(! pHaveCommonMonoms(p, q));
    7272#ifdef HAVE_RINGS
    73   assume(!rField_is_Ring(currRing));
     73  assume(!rField_is_Ring(r));
    7474#endif
    7575  assume(lp >= 1 && lq >= 1);

  • libpolys/polys/simpleideals.cc

    r4021bb rf7a975  
    88
    99/* includes */
    10 #include <kernel/mod2.h>
    11 
    12 #ifndef NDEBUG
    13 # define MYTEST 0
    14 #else /* ifndef NDEBUG */
    15 # define MYTEST 1
    16 #endif /* ifndef NDEBUG */
    17 
    18 #include <kernel/options.h>
    19 #include <omalloc/omalloc.h>
    20 #include <kernel/febase.h>
    21 #include <kernel/numbers.h>
    22 #include <kernel/longrat.h>
    23 #include <kernel/polys.h>
    24 #include <kernel/ring.h>
    25 #include <kernel/kstd1.h>
    26 #include <kernel/matpol.h>
    27 #include <kernel/weight.h>
    28 #include <kernel/intvec.h>
    29 #include <kernel/syz.h>
    30 #include <kernel/sparsmat.h>
    31 #include <kernel/ideals.h>
    32 #include <kernel/prCopy.h>
    33 #include <kernel/gring.h>
    34 
    35 
    36 omBin sip_sideal_bin = omGetSpecBin(sizeof(sip_sideal));
    37 
    38 /* #define WITH_OLD_MINOR */
    39 #define pCopy_noCheck(p) pCopy(p)
    40 
    41 static poly * idpower;
    42 /*collects the monomials in makemonoms, must be allocated befor*/
    43 static int idpowerpoint;
    44 /*index of the actual monomial in idpower*/
    45 static poly * givenideal;
    46 /*the ideal from which a power is computed*/
    47 
    48 /*0 implementation*/
    4910
    5011/*2

  • libpolys/polys/simpleideals.h

    r4021bb rf7a975  
    99*/
    1010#include <polys/monomials/ring.h>
     11
     12struct sip_sideal
     13{
     14  poly*  m;
     15  long rank;
     16  int nrows;
     17  int ncols;
     18  #define IDELEMS(i) ((i)->ncols)
     19  #define MATCOLS(i) ((i)->ncols)
     20  #define MATROWS(i) ((i)->nrows)
     21  #define MATELEM(mat,i,j) ((mat)->m)[MATCOLS((mat)) * ((i)-1) + (j)-1]
     22   
     23};
     24
     25struct sip_smap
     26{
     27  poly *m;
     28  char *preimage;
     29  int nrows;
     30  int ncols;
     31};
     32
     33class ip_smatrix;
     34typedef ip_smatrix *       matrix;
     35
     36struct sideal_list;
     37typedef struct sideal_list *      ideal_list;
     38
     39struct sideal_list
     40{
     41  ideal_list next;
     42  ideal      d;
     43#ifndef NDEBUG
     44  int nr;
     45#endif
     46};
    1147
    1248#ifdef PDEBUG

  • libpolys/polys/templates/p_Procs_Dynamic.cc

    r4021bb rf7a975  
    1111#include "polys/config.h"
    1212// #include <polys/structs.h>
    13 #include <polys/p_polys.h>
    1413#include <polys/monomials/ring.h>
     14#include <polys/monomials/p_polys.h>
    1515#include <polys/p_Procs.h>
    1616#include <polys/p_Numbers.h>

  • libpolys/polys/templates/p_Procs_Static.cc

    r4021bb rf7a975  
    1111#include "polys/config.h"
    1212// #include <polys/structs.h>
    13 #include <polys/p_polys.h>
    1413#include <polys/monomials/ring.h>
     14#include <polys/monomials/p_polys.h>
    1515#include <polys/p_Procs.h>
    1616#include <polys/p_Numbers.h>
Note: See TracChangeset for help on using the changeset viewer.