Changeset 266ae3 in git


Ignore:
Timestamp:
Jan 19, 2018, 11:05:53 AM (6 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
24bc731bfbe23b437f98252035079828a0289a6f
Parents:
c0a0e5c2821b7e65272ac540b3a99cd00f2c40c2
Message:
chg: only one definition for poly/ideal/map/matrix
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • Singular/dyn_modules/syzextra/myNF.h

    rc0a0e5 r266ae3  
    2020// include basic definitions
    2121#include "singularxx_defs.h"
    22 
    23 struct  spolyrec;
    24 typedef struct spolyrec    polyrec;
    25 typedef polyrec *          poly;
    26 
    27 struct ip_sring;
    28 typedef struct ip_sring *         ring;
    29 
    30 struct sip_sideal;
    31 typedef struct sip_sideal *       ideal;
     22#include "polys/monomials/ring.h"
    3223
    3324/// high-level functio, which calls kNF2Length(redNFLength)

  • Singular/dyn_modules/syzextra/syzextra.h

    rc0a0e5 r266ae3  
    2626#include "kernel/ideals.h"
    2727
    28 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    29 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    30 
    31 struct sip_sideal; typedef struct sip_sideal *       ideal;
    3228class idrec; typedef idrec *   idhdl;
    3329

  • kernel/combinatorics/hilb.h

    rc0a0e5 r266ae3  
    88*/
    99
    10 struct spolyrec  ; typedef struct spolyrec polyrec; typedef polyrec * poly;
    11 struct ip_sring  ; typedef struct ip_sring                          * ring;
    12 struct sip_sideal; typedef struct sip_sideal                        * ideal;
    13 
    14 class intvec;
    15 
    16 extern ring currRing;
     10#include "polys/monomials/ring.h"
     11#include "kernel/polys.h"
     12#include "misc/intvec.h"
    1713
    1814intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree, ideal Q=NULL, ring tailRing = currRing);

  • kernel/combinatorics/hutil.h

    rc0a0e5 r266ae3  
    88*/
    99
    10 class intvec;
    11 
    12 struct ip_sring  ; typedef struct ip_sring                          * ring;
    13 struct sip_sideal; typedef struct sip_sideal                        * ideal;
    14 struct spolyrec  ; typedef struct spolyrec polyrec; typedef polyrec * poly;
    15 typedef                                                     poly    * polyset;
     10#include "polys/monomials/ring.h"
     11#include "kernel/polys.h"
     12#include "misc/intvec.h"
    1613
    1714typedef int * scmon;

  • kernel/combinatorics/stairc.h

    rc0a0e5 r266ae3  
    88*/
    99
    10 struct spolyrec  ; typedef struct spolyrec polyrec; typedef polyrec * poly;
    11 struct ip_sring  ; typedef struct ip_sring                          * ring;
    12 struct sip_sideal; typedef struct sip_sideal                        * ideal;
    13 
    14 class intvec;
    15 
    16 extern ring currRing;
     10#include "polys/monomials/ring.h"
     11#include "kernel/polys.h"
     12#include "misc/intvec.h"
    1713
    1814void scComputeHC(ideal s,ideal Q, int  k,poly &hEdge, ring tailRing = currRing);

  • kernel/linear_algebra/Minor.h

    rc0a0e5 r266ae3  
    22#define MINOR_H
    33
     4#include "polys/monomials/ring.h"
     5#include "kernel/polys.h"
     6
    47// #include <assert.h>
    58#include <string>
    69
    7 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    8 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    9 
    10 struct sip_sideal; typedef struct sip_sideal *       ideal;
    1110
    1211// using namespace std;

  • kernel/linear_algebra/MinorInterface.h

    rc0a0e5 r266ae3  
    22#define MINOR_INTERFACE_H
    33
    4 
    5 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    6 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    7 
    8 struct sip_sideal; typedef struct sip_sideal *       ideal;
    9 
    10 class ip_smatrix; typedef ip_smatrix *       matrix;
     4#include "polys/monomials/ring.h"
     5#include "kernel/polys.h"
    116
    127/* all computations are module char, if char <> 0;

  • kernel/linear_algebra/MinorProcessor.h

    rc0a0e5 r266ae3  
    22#define MINOR_PROCESSOR_H
    33
     4#include "polys/monomials/ring.h"
     5#include "kernel/polys.h"
    46#include "kernel/linear_algebra/Cache.h"
    57#include "kernel/linear_algebra/Minor.h"
    6 
    7 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    8 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    9 
    10 struct sip_sideal; typedef struct sip_sideal *       ideal;
    118
    129// #include <assert.h>

  • kernel/linear_algebra/interpolation.h

    rc0a0e5 r266ae3  
    88#ifndef INTERPOLATION_H
    99#define INTERPOLATION_H
    10 
     10#include "polys/monomials/ring.h"
     11#include "misc/intvec.h"
    1112#include <vector>
    12 
    13 class intvec;
    14 struct sip_sideal; typedef struct sip_sideal * ideal;
    1513
    1614ideal interpolation(const std::vector<ideal>& L, intvec *v);

  • libpolys/polys/clapsing.h

    rc0a0e5 r266ae3  
    1010#define INCL_FACTORYSING_H
    1111
    12 class bigintmat;
    13 class intvec;
    14 
    15 struct snumber; typedef struct snumber *   number;
    16 struct spolyrec; typedef struct spolyrec    polyrec; typedef polyrec *          poly;
    17 struct ip_sring; typedef struct ip_sring *         ring;
    18 struct sip_sideal; typedef struct sip_sideal *       ideal;
    19 
    20 class ip_smatrix; typedef ip_smatrix *       matrix;
    21 
    22 struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;
     12#include "polys/monomials/ring.h"
     13#include "polys/matpol.h"
     14#include "misc/intvec.h"
     15#include "coeffs/bigintmat.h"
    2316
    2417/// destroys f and g

  • libpolys/polys/ext_fields/algext.h

    rc0a0e5 r266ae3  
    3232
    3333#include "coeffs/coeffs.h"
    34 
    35 // Forward declarations
    36 struct ip_sring; typedef struct ip_sring * ring;
    37 struct sip_sideal; typedef struct sip_sideal * ideal;
     34#include "polys/monomials/ring.h"
    3835
    3936/// struct for passing initialization parameters to naInitChar
    … …  
    4946/// if m == var(i)/1 => return i,
    5047int naIsParam(number, const coeffs);
    51 
    52 struct  spolyrec;
    53 typedef struct spolyrec    polyrec;
    54 typedef polyrec *          poly;
    5548
    5649/// assumes that p and q are univariate polynomials in r,

  • libpolys/polys/ext_fields/transext.h

    rc0a0e5 r266ae3  
    3535
    3636#include "coeffs/coeffs.h"
    37 
    38 struct ip_sring;
    39 typedef struct ip_sring * ring;
    40 
     37#include "polys/monomials/ring.h"
    4138
    4239// restrict access to the internal represention as much as possible:
    4340#ifdef TRANSEXT_PRIVATES
    44 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec * poly;
    45 
    4641
    4742/** a number in K(t_1, .., t_s) is represented by either NULL

  • libpolys/polys/kbuckets.h

    rc0a0e5 r266ae3  
    1313// define to not really use the bucket feature
    1414// #define HAVE_PSEUDO_BUCKETS
    15 class  kBucket; typedef kBucket* kBucket_pt;
    16 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    17 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
     15//class  kBucket; typedef kBucket* kBucket_pt; // ring.h
    1816
    1917#include "polys/monomials/ring.h" // for ring->p_Procs->p_kBucketSetLm!

  • libpolys/polys/monomials/ring.h

    rc0a0e5 r266ae3  
    1212#include "misc/auxiliary.h"
    1313#include "coeffs/coeffs.h"
     14#include "misc/intvec.h"
     15#include "misc/int64vec.h"
     16#include "polys/monomials/monomials.h"
    1417//#include "polys/monomials/polys-impl.h"
    1518//
    … …  
    1720/* forward declaration of types */
    1821class idrec; typedef idrec *   idhdl; // _only_ for idhdl ip_sring::idroot
    19 struct  spolyrec;
    20 typedef struct spolyrec    polyrec;
    21 typedef struct spolyrec *         poly;
    22 typedef struct spolyrec const *   const_poly;
     22//struct  spolyrec;
     23//typedef struct spolyrec    polyrec;
     24//typedef struct spolyrec *         poly;
     25//typedef struct spolyrec const *   const_poly;
    2326struct ip_sring;
    2427typedef struct ip_sring *         ring;
    2528typedef struct ip_sring const *   const_ring;
    26 class intvec;
    27 class int64vec;
    2829struct p_Procs_s;
    2930typedef struct p_Procs_s p_Procs_s;
    30 //class slists;
    31 //typedef slists *           lists;
    3231class kBucket;
    3332typedef kBucket*           kBucket_pt;

  • libpolys/polys/nc/gb_hack.h

    rc0a0e5 r266ae3  
    66#ifdef PLURAL_INTERNAL_DECLARATIONS
    77#include "polys/nc/nc.h"
    8 
    9 struct  spolyrec; typedef struct spolyrec    polyrec; typedef polyrec *          poly;
    10 struct ip_sring; typedef struct ip_sring *         ring;
    11 struct sip_sideal; typedef struct sip_sideal *       ideal;
    12 
    13 class intvec;
    148
    159extern NF_Proc nc_NF;

  • libpolys/polys/nc/nc.h

    rc0a0e5 r266ae3  
    44#include "polys/monomials/ring.h"
    55#include "polys/kbuckets.h"
     6#include "polys/matpol.h"
    67
    78#ifdef HAVE_PLURAL
    89
    9 // TODO: the following is a part of ring.h... would be nice to have a
    10 // clear public NC interface defined here!
    11 
    12 
    13 class ip_smatrix;
    14 typedef ip_smatrix *       matrix;
    15 
    16 
    1710matrix nc_PrintMat(int a, int b, ring r, int metric);
    18 
    1911
    2012enum nc_type

  • libpolys/polys/nc/summator.h

    rc0a0e5 r266ae3  
    88
    99#ifdef HAVE_SUMMATOR
    10 
    11 // struct snumber; typedef struct snumber *   number;
    12 
    13 class  sBucket; typedef sBucket* sBucket_pt;
    14 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    15 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    16 
    17 
    18 class  kBucket; typedef kBucket* kBucket_pt;
     10#include "polys/monomials/ring.h"
     11#include "polys/sbuckets.h"
    1912
    2013// TODO: redesign into templates with no extra run-time cost!!!

  • libpolys/polys/operations/p_Mult_q.h

    rc0a0e5 r266ae3  
    1414
    1515#include "misc/auxiliary.h"
    16 
    17 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
     16#include "polys/monomials/ring.h"
    1817
    1918// Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET

  • libpolys/polys/prCopy.h

    rc0a0e5 r266ae3  
    88*/
    99
    10 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    11 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    12 struct sip_sideal; typedef struct sip_sideal *ideal;
    13 
    14 struct snumber; typedef struct snumber *   number;
    15 struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;
     10#include "polys/monomials/ring.h"
    1611
    1712typedef number (*nMapFunc)(number a, const coeffs src, const coeffs dst);

  • libpolys/polys/sbuckets.h

    rc0a0e5 r266ae3  
    1313#ifndef S_BUCKETS_H
    1414#define S_BUCKETS_H
    15 
     15#include "polys/monomials/ring.h"
    1616class sBucket; typedef sBucket*           sBucket_pt;
    17 struct  spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    18 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
    19 
    20 
    2117
    2218//////////////////////////////////////////////////////////////////////////

  • libpolys/polys/templates/p_Procs.h

    rc0a0e5 r266ae3  
    1313
    1414#include "omalloc/omalloc.h"
    15 
    16 struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
    17 struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
     15#include "polys/monomials/ring.h"
    1816
    1917/*------------- p_Proc stuff ----------------------*/
Note: See TracChangeset for help on using the changeset viewer.